diff --git a/src/Headless/Avalonia.Headless.NUnit/AvaloniaTest.cs b/src/Headless/Avalonia.Headless.NUnit/AvaloniaTest.cs
index 94b75cf849..3e115fe5c1 100644
--- a/src/Headless/Avalonia.Headless.NUnit/AvaloniaTest.cs
+++ b/src/Headless/Avalonia.Headless.NUnit/AvaloniaTest.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Headless.NUnit;
 /// such that awaited expressions resume on the test's "main thread".
 /// </summary>
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
-public sealed class AvaloniaTestAttribute : TestCaseAttribute, IWrapSetUpTearDown
+public sealed class AvaloniaTestAttribute : TestAttribute, IWrapSetUpTearDown
 {
     public TestCommand Wrap(TestCommand command)
     {
diff --git a/tests/Avalonia.Headless.UnitTests/ThreadingTests.cs b/tests/Avalonia.Headless.UnitTests/ThreadingTests.cs
index 403ff84f2c..5a6026c1de 100644
--- a/tests/Avalonia.Headless.UnitTests/ThreadingTests.cs
+++ b/tests/Avalonia.Headless.UnitTests/ThreadingTests.cs
@@ -18,7 +18,7 @@ public class ThreadingTests
     }
 
 #if NUNIT
-    [AvaloniaTest(Ignore = "This test should always fail, enable to test if it fails")]
+    [AvaloniaTest, Ignore("This test should always fail, enable to test if it fails")]
 #elif XUNIT
     [AvaloniaFact(Skip = "This test should always fail, enable to test if it fails")]
 #endif