diff --git a/Directory.Packages.props b/Directory.Packages.props
index 25f974f..09a58eb 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -29,7 +29,6 @@
     <PackageVersion Include="Microsoft.VisualStudio.Services.BlobStore.Client" Version="$(ArtifactsPackageVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Services.BlobStore.Client.Cache" Version="$(ArtifactsPackageVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Services.PipelineCache.WebApi" Version="$(ArtifactsPackageVersion)" />
-    <PackageVersion Include="MSTest" Version="3.5.0" />
     <!--
       An indirect dependency of BXL (Minimatch) depends on a very old and non-existing version of NETStandard.Library (>= 1.0.0-rc2-23910).
       This forces a good version of NETStandard.Library to mitigate.
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..eebcd46
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+    "msbuild-sdks": {
+      "MSTest.Sdk": "3.6.1"
+    }
+  }
\ No newline at end of file
diff --git a/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj b/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj
index 98a64f8..d376764 100644
--- a/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj
+++ b/src/Common.Tests/Microsoft.MSBuildCache.Common.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <!-- Only supports x64 due to the RocksDB dependency -->
     <Platform>x64</Platform>
@@ -11,7 +11,6 @@
     <NoWarn>$(NoWarn);CA1034</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSTest" />
     <PackageReference Include="morelinq" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj b/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
index ed74e09..33fbef8 100644
--- a/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
+++ b/src/Repack.Tests/Microsoft.MSBuildCache.Repack.Tests.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <!-- Only supports x64 due to the RocksDB dependency -->
     <Platform>x64</Platform>
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>$(Platform)</Platforms>
     <TargetFrameworks>net472;net8.0</TargetFrameworks>
     <RootNamespace>Microsoft.MSBuildCache.Repack.Tests</RootNamespace>
     <!-- Suppress "Avoid constant arrays as arguments". UTs have many one-off test data arrays. -->
@@ -11,7 +11,6 @@
     <NoWarn>$(NoWarn);CA1034</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSTest" />
     <PackageReference Include="morelinq" />
   </ItemGroup>
   <ItemGroup>