diff --git a/Directory.Packages.props b/Directory.Packages.props
index c340355..35caff2 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,7 +14,7 @@
 
     <!-- Tests -->
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
   </ItemGroup>
 
diff --git a/tests/MrGameEng.Assets.Generator.Tests/AssetHandlesGeneratorTests.cs b/tests/MrGameEng.Assets.Generator.Tests/AssetHandlesGeneratorTests.cs
index 0da6ce2..1227fb0 100644
--- a/tests/MrGameEng.Assets.Generator.Tests/AssetHandlesGeneratorTests.cs
+++ b/tests/MrGameEng.Assets.Generator.Tests/AssetHandlesGeneratorTests.cs
@@ -109,13 +109,15 @@ public class AssetHandlesGeneratorTests
 
         var compilation = CSharpCompilation.Create(
             "generated",
-            [CSharpSyntaxTree.ParseText(source), CSharpSyntaxTree.ParseText(stubs)],
+            [CSharpSyntaxTree.ParseText(source, cancellationToken: TestContext.Current.CancellationToken),
+             CSharpSyntaxTree.ParseText(stubs, cancellationToken: TestContext.Current.CancellationToken)],
             [MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
              MetadataReference.CreateFromFile(System.Runtime.Loader.AssemblyLoadContext.Default
                  .LoadFromAssemblyName(new System.Reflection.AssemblyName("System.Runtime")).Location)],
             new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
 
-        var errors = compilation.GetDiagnostics().Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
+        var errors = compilation.GetDiagnostics(TestContext.Current.CancellationToken)
+            .Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
         Assert.Empty(errors);
     }
 
diff --git a/tests/MrGameEng.Assets.Generator.Tests/MrGameEng.Assets.Generator.Tests.csproj b/tests/MrGameEng.Assets.Generator.Tests/MrGameEng.Assets.Generator.Tests.csproj
index db5b6f7..a6c000d 100644
--- a/tests/MrGameEng.Assets.Generator.Tests/MrGameEng.Assets.Generator.Tests.csproj
+++ b/tests/MrGameEng.Assets.Generator.Tests/MrGameEng.Assets.Generator.Tests.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
diff --git a/tests/MrGameEng.Core.Tests/MrGameEng.Core.Tests.csproj b/tests/MrGameEng.Core.Tests/MrGameEng.Core.Tests.csproj
index 6bafeb8..947b90f 100644
--- a/tests/MrGameEng.Core.Tests/MrGameEng.Core.Tests.csproj
+++ b/tests/MrGameEng.Core.Tests/MrGameEng.Core.Tests.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
diff --git a/tests/MrGameEng.DevConsole.Tests/MrGameEng.DevConsole.Tests.csproj b/tests/MrGameEng.DevConsole.Tests/MrGameEng.DevConsole.Tests.csproj
index 8909ee9..4291e6b 100644
--- a/tests/MrGameEng.DevConsole.Tests/MrGameEng.DevConsole.Tests.csproj
+++ b/tests/MrGameEng.DevConsole.Tests/MrGameEng.DevConsole.Tests.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
diff --git a/tests/MrGameEng.Graphics.Tests/MrGameEng.Graphics.Tests.csproj b/tests/MrGameEng.Graphics.Tests/MrGameEng.Graphics.Tests.csproj
index a03c40c..dd65987 100644
--- a/tests/MrGameEng.Graphics.Tests/MrGameEng.Graphics.Tests.csproj
+++ b/tests/MrGameEng.Graphics.Tests/MrGameEng.Graphics.Tests.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
diff --git a/tests/MrGameEng.Input.Tests/MrGameEng.Input.Tests.csproj b/tests/MrGameEng.Input.Tests/MrGameEng.Input.Tests.csproj
index 0a612bd..a81782d 100644
--- a/tests/MrGameEng.Input.Tests/MrGameEng.Input.Tests.csproj
+++ b/tests/MrGameEng.Input.Tests/MrGameEng.Input.Tests.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>