diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index ed035ae..0c8637f 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -16,8 +16,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         # No "with: dotnet-version" specified -> use global.json
+      - name: Setup x86 .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          architecture: x86
       - run: dotnet restore
       - run: dotnet build --configuration Release --no-restore
       - name: Shrink C drive and create a ReFS E drive, then run tests
@@ -41,5 +45,5 @@ jobs:
           @rem CODESYNC: WindowsReFSDriveSession.cs
           set CoW_Test_ReFS_Drive=E:\
 
-          dotnet test --no-restore
+          dotnet test --configuration Release --no-build
         shell: cmd
diff --git a/global.json b/global.json
index 17c0c8e..bf6944b 100644
--- a/global.json
+++ b/global.json
@@ -2,5 +2,8 @@
   "sdk": {
     "version": "8.0.101",
     "rollForward": "latestMinor"
+  },
+  "msbuild-sdks": {
+    "MSTest.Sdk": "3.6.4"
   }
 }
diff --git a/tests/unit/32bit/CopyOnWriteTests32.csproj b/tests/unit/32bit/CopyOnWriteTests32.csproj
index a73dafa..5f07713 100644
--- a/tests/unit/32bit/CopyOnWriteTests32.csproj
+++ b/tests/unit/32bit/CopyOnWriteTests32.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
   <Import Project="../CopyOnWriteTests.props"/>
 
diff --git a/tests/unit/64bit/CopyOnWriteTests.csproj b/tests/unit/64bit/CopyOnWriteTests.csproj
index 190dcfb..ccc1479 100644
--- a/tests/unit/64bit/CopyOnWriteTests.csproj
+++ b/tests/unit/64bit/CopyOnWriteTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
   <Import Project="../CopyOnWriteTests.props" />
 
diff --git a/tests/unit/CopyOnWriteTests.props b/tests/unit/CopyOnWriteTests.props
index 292331c..7643eea 100644
--- a/tests/unit/CopyOnWriteTests.props
+++ b/tests/unit/CopyOnWriteTests.props
@@ -5,12 +5,6 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="../*.cs" />
     <Compile Include="../Windows/*.cs" />