diff --git a/Directory.Packages.props b/Directory.Packages.props
index fa980e86e..8beeef793 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -21,7 +21,10 @@
     <PackageVersion Include="MinVer" Version="5.0.0" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="morelinq" Version="4.2.0" />
-    <PackageVersion Include="MSTest" Version="3.5.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.5.1" />
+    <PackageVersion Include="MSTest.Analyzers" Version="3.5.1" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.5.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Newtonsoft.Json.Schema" Version="3.0.16" />
     <PackageVersion Include="NuGet.ProjectModel" Version="6.10.0" />
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index fc41b98c9..1320f9de4 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -3,7 +3,8 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="MSTest"/>
+    <PackageReference Include="MSTest.TestFramework"/>
+    <PackageReference Include="MSTest.Analyzers "/>
     <PackageReference Include="Moq"/>
     <PackageReference Include="FluentAssertions"/>
     <PackageReference Include="Faker.net"/>
diff --git a/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj b/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj
index 5618dac4a..b4be8372d 100644
--- a/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj
+++ b/test/Microsoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj
@@ -9,6 +9,8 @@
       <PackageReference Include="FluentAssertions.Analyzers" PrivateAssets="all" />
       <PackageReference Include="Microsoft.Extensions.Logging" />
       <PackageReference Include="System.Threading.Tasks.Dataflow" />
+      <PackageReference Include="MSTest.TestAdapter "/>
+      <PackageReference Include="Microsoft.NET.Test.Sdk "/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj b/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj
index 8f8b8cdd0..93cb733eb 100644
--- a/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj
+++ b/test/Microsoft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj
@@ -9,6 +9,8 @@
         <PackageReference Include="System.Reactive" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
         <PackageReference Include="packageurl-dotnet" />
+        <PackageReference Include="MSTest.TestAdapter " />
+        <PackageReference Include="Microsoft.NET.Test.Sdk " />
         <PackageReference Include="FluentAssertions.Analyzers" PrivateAssets="all" />
     </ItemGroup>
 
diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj b/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj
index 6e7e24dbc..efcd77335 100644
--- a/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj
+++ b/test/Microsoft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj
@@ -14,6 +14,8 @@
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
         <PackageReference Include="packageurl-dotnet" />
         <PackageReference Include="YamlDotNet" />
+        <PackageReference Include="MSTest.TestAdapter "/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk "/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj
index 3bffac99c..c92dc5a57 100644
--- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj
+++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj
@@ -11,7 +11,9 @@
         <PackageReference Include="Spectre.Console.Cli" />
         <PackageReference Include="Spectre.Console.Testing" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
-      <PackageReference Include="FluentAssertions.Analyzers" PrivateAssets="all" />
+        <PackageReference Include="MSTest.TestAdapter "/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk "/>
+        <PackageReference Include="FluentAssertions.Analyzers" PrivateAssets="all" />
     </ItemGroup>
 
 </Project>