diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 27eb8bb9d..e344d117a 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -12,9 +12,9 @@
     <PackageVersion Include="PolySharp" Version="1.15.0" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="Spectre.Verify.Extensions" Version="22.3.2-preview.0.1" />
-    <PackageVersion Include="Verify.Xunit" Version="28.2.1" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="Verify.XunitV3" Version="28.10.1" />
+    <PackageVersion Include="xunit.v3" Version="1.1.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
     <PackageVersion Include="System.Memory" Version="4.6.0" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageVersion Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.160" />
diff --git a/src/Tests/Directory.Build.props b/src/Tests/Directory.Build.props
index 9932e25e0..ac6f15102 100644
--- a/src/Tests/Directory.Build.props
+++ b/src/Tests/Directory.Build.props
@@ -5,6 +5,9 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\..\..\resources\spectre.snk</AssemblyOriginatorKeyFile>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+    <OutputType>Exe</OutputType>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj b/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj
index 1d95708b9..0b8df40e5 100644
--- a/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj
+++ b/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj
@@ -10,8 +10,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
     <PackageReference Include="Shouldly"/>
     <PackageReference Include="Spectre.Verify.Extensions"/>
-    <PackageReference Include="Verify.Xunit"/>
-    <PackageReference Include="xunit"/>
+    <PackageReference Include="Verify.XunitV3"/>
+    <PackageReference Include="xunit.v3"/>
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj b/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj
index 352f29d92..bf344c883 100644
--- a/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj
+++ b/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj
@@ -17,8 +17,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Shouldly" />
     <PackageReference Include="Spectre.Verify.Extensions" />
-    <PackageReference Include="Verify.Xunit" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="Verify.XunitV3" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Tests/Spectre.Console.Tests/Unit/AnsiConsoleTests.Prompt.cs b/src/Tests/Spectre.Console.Tests/Unit/AnsiConsoleTests.Prompt.cs
index dc512b436..f6b70ecf5 100644
--- a/src/Tests/Spectre.Console.Tests/Unit/AnsiConsoleTests.Prompt.cs
+++ b/src/Tests/Spectre.Console.Tests/Unit/AnsiConsoleTests.Prompt.cs
@@ -19,7 +19,7 @@ public async Task Should_Return_Default_Value_If_Nothing_Is_Entered(bool async,
             bool result;
             if (async)
             {
-                result = await console.ConfirmAsync("Want some prompt?", defaultValue);
+                result = await console.ConfirmAsync("Want some prompt?", defaultValue, cancellationToken: TestContext.Current.CancellationToken);
             }
             else
             {
@@ -46,7 +46,7 @@ public async Task Should_Return_Correct_DateTime_When_Asked_PL_Culture(bool asyn
             DateTime dateTime;
             if (async)
             {
-                dateTime = await console.AskAsync<DateTime>(string.Empty, CultureInfo.GetCultureInfo("pl-PL"));
+                dateTime = await console.AskAsync<DateTime>(string.Empty, CultureInfo.GetCultureInfo("pl-PL"), cancellationToken: TestContext.Current.CancellationToken);
             }
             else
             {
@@ -70,7 +70,7 @@ public async Task Should_Return_Correct_DateTime_When_Asked_US_Culture(bool asyn
             DateTime dateTime;
             if (async)
             {
-                dateTime = await console.AskAsync<DateTime>(string.Empty, CultureInfo.GetCultureInfo("en-US"));
+                dateTime = await console.AskAsync<DateTime>(string.Empty, CultureInfo.GetCultureInfo("en-US"), cancellationToken: TestContext.Current.CancellationToken);
             }
             else
             {