diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51930a5..9c1826e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  workflow_dispatch: 
 
 permissions:
   contents: read
@@ -19,7 +20,7 @@ defaults:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v6
@@ -31,10 +32,12 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --verbosity normal --framework net10.0 --logger "trx;LogFileName=TestResults.trx"
+    - name: Test net472
+      run: dotnet test UUIDNext.Test/UUIDNext.Test.csproj --framework net472 --no-build --verbosity normal --logger trx --results-directory TestResults_net472
+    - name: Test net10.0
+      run: dotnet test UUIDNext.Test/UUIDNext.Test.csproj --framework net10.0 --no-build --verbosity normal --logger trx --results-directory TestResults_net10.0
     - name: Upload test results
       uses: actions/upload-artifact@v7
       with:
         name: TestResults
-        path: ./src/Test/TestResults/TestResults.trx
\ No newline at end of file
+        path: Src/TestResults_*/*.trx
\ No newline at end of file
diff --git a/Src/UUIDNext.Test/UUIDNext.Test.csproj b/Src/UUIDNext.Test/UUIDNext.Test.csproj
index a354dd4..df4fe23 100644
--- a/Src/UUIDNext.Test/UUIDNext.Test.csproj
+++ b/Src/UUIDNext.Test/UUIDNext.Test.csproj
@@ -18,6 +18,7 @@
     <PackageReference Include="NFluent" Version="3.1.0" />
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
     <PackageReference Include="xunit.v3" Version="3.2.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" />
     <PackageReference Include="coverlet.collector" Version="8.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>