diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3656b02..6fbccda 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,7 +104,7 @@ jobs:
           fi
 
       - name: Test with coverage
-        run: dotnet test -c Release --no-build --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
+        run: dotnet test -c Release --no-build --results-directory ./coverage -- --coverage --coverage-output-format cobertura
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
diff --git a/.gitignore b/.gitignore
index d62b104..8034ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -405,3 +405,6 @@ FodyWeavers.xsd
 /docs/_site/
 /docs/api/
 /docs/obj/
+
+# Microsoft.Testing.Platform coverage output directory (--results-directory ./coverage)
+coverage/
diff --git a/Tharga.Toolkit.Standard.Tests/Tharga.Toolkit.Standard.Tests.csproj b/Tharga.Toolkit.Standard.Tests/Tharga.Toolkit.Standard.Tests.csproj
index 2acb5c7..d811652 100644
--- a/Tharga.Toolkit.Standard.Tests/Tharga.Toolkit.Standard.Tests.csproj
+++ b/Tharga.Toolkit.Standard.Tests/Tharga.Toolkit.Standard.Tests.csproj
@@ -13,11 +13,12 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
 		<PackageReference Include="Moq.AutoMock" Version="4.0.3" />
 		<PackageReference Include="Tharga.Test.Toolkit" Version="1.14.15" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+		<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="xunit.v3" Version="3.2.2" />
+		<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.10.0" />
+		<PackageReference Include="xunit.v3" Version="4.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Tharga.Toolkit.Tests/Tharga.Toolkit.Tests.csproj b/Tharga.Toolkit.Tests/Tharga.Toolkit.Tests.csproj
index 68f8d30..53af460 100644
--- a/Tharga.Toolkit.Tests/Tharga.Toolkit.Tests.csproj
+++ b/Tharga.Toolkit.Tests/Tharga.Toolkit.Tests.csproj
@@ -16,19 +16,12 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
     <PackageReference Include="Moq.AutoMock" Version="4.0.3" />
     <PackageReference Include="Tharga.Test.Toolkit" Version="1.14.15" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+    <PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="10.0.1">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="10.0.1">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.v3" Version="3.2.2" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.10.0" />
+    <PackageReference Include="xunit.v3" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..3140116
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}