diff --git a/Directory.Packages.props b/Directory.Packages.props
index f96aef5d5f..6690ffc109 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -39,6 +39,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.553101" />
     <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="$(MicrosoftTestingExtensionsCodeCoverageVersion)" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.AdapterUtilities" Version="$(MicrosoftNETTestSdkVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftNETTestSdkVersion)" />
diff --git a/samples/Playground/Playground.csproj b/samples/Playground/Playground.csproj
index f83ced76c8..04bee41459 100644
--- a/samples/Playground/Playground.csproj
+++ b/samples/Playground/Playground.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="$(MicrosoftNETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Package/MSTest/MSTest.NonWindows.nuspec b/src/Package/MSTest/MSTest.NonWindows.nuspec
deleted file mode 100644
index 2a3c74c888..0000000000
--- a/src/Package/MSTest/MSTest.NonWindows.nuspec
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    $CommonMetadataElements$
-    <dependencies>
-      <group targetFramework="netstandard2.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net6.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net7.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net8.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net9.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    $CommonFileElements$
-  </files>
-</package>
diff --git a/src/Package/MSTest/MSTest.csproj b/src/Package/MSTest/MSTest.csproj
index 5263dba60d..341742a3c5 100644
--- a/src/Package/MSTest/MSTest.csproj
+++ b/src/Package/MSTest/MSTest.csproj
@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SupportedNetFrameworks);netstandard2.0</TargetFrameworks>
 
-  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
-    <NuspecFile Condition=" '$(OS)' == 'Windows_NT' ">MSTest.nuspec</NuspecFile>
-    <NuspecFile Condition=" '$(OS)' != 'Windows_NT' ">MSTest.NonWindows.nuspec</NuspecFile>
-    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
     <PackageId>MSTest</PackageId>
     <PackageTags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</PackageTags>
+    <PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
     <PackageDescription>
       MSTest is Microsoft supported Test Framework.
 
@@ -23,19 +21,21 @@
       - .NET 6.0 Windows.18362+
       - UWP 10.0.16299
     </PackageDescription>
-    <!-- Nothing in lib but that's expected -->
-    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup Label="NuGet">
-    <NuspecProperty Include="TestPlatformVersion=$(MicrosoftNETTestSdkVersion)" />
-    <NuspecProperty Include="RepoRoot=$(RepoRoot)" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
+    <ProjectReference Include="..\..\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
+    <ProjectReference Include="..\..\Analyzers\MSTest.Analyzers\MSTest.Analyzers.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Not a real dependency but it ensures correct build order -->
-    <ProjectReference Include="..\..\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
+    <!-- Microsoft.NET.Test.Sdk package is referenced by build system, so omitting it. -->
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Condition="'$(TargetFramework)' != '$(UwpMinimum)'" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Package/MSTest/MSTest.nuspec b/src/Package/MSTest/MSTest.nuspec
deleted file mode 100644
index 7341858a85..0000000000
--- a/src/Package/MSTest/MSTest.nuspec
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    $CommonMetadataElements$
-    <dependencies>
-      <group targetFramework="netstandard2.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net462">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="uap10.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <!-- Microsoft.NET.Test.Sdk package is referenced by build system, so omitting it. -->
-        <!-- <dependency id="Microsoft.NET.Test.Sdk" version="[$TestPlatformVersion$]" /> -->
-      </group>
-
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net6.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net7.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net8.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-
-      <group targetFramework="net9.0">
-        <dependency id="MSTest.TestAdapter" version="[$version$]" />
-        <dependency id="MSTest.TestFramework" version="[$version$]" />
-        <dependency id="MSTest.Analyzers" version="[$version$]" />
-        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
-      </group>
-    </dependencies>
-    <readme>PACKAGE.md</readme>
-  </metadata>
-  <files>
-    $CommonFileElements$
-
-    <file src="$RepoRoot$src\Package\MSTest\PACKAGE.md" target="" />
-  </files>
-</package>