diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6cc7e3741e..c981d9cd67 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,9 +9,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
       <Sha>165896e7efeecb70f01bd011257ead0f56d32c95</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210520-02">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.10.0">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>4ec8825c93fbea1bf66408c1bdfd1087c3590e4e</Sha>
+      <Sha>5c9abb2ae1b0318dc52729a3639e72089c79fb3c</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9af69ed0df..5c0875515f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,11 +2,11 @@
 <Project>
   <PropertyGroup>
     <!-- This repo version -->
-    <VersionPrefix>6.0.0</VersionPrefix>
-    <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
+    <VersionPrefix>2.2.4</VersionPrefix>
+    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <!-- Opt-out repo features -->
     <UsingToolXliff>false</UsingToolXliff>
-    <MicrosoftNETTestSdkVersion>17.0.0-preview-20210520-02</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>16.10.0</MicrosoftNETTestSdkVersion>
     <!-- Toolset -->
     <MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
     <NuGetFrameworksVersion>5.9.1</NuGetFrameworksVersion>
diff --git a/test/E2ETests/Automation.CLI/CLITestBase.common.cs b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
index 6e98813f68..bef108e055 100644
--- a/test/E2ETests/Automation.CLI/CLITestBase.common.cs
+++ b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
@@ -19,7 +19,7 @@ public partial class CLITestBase
         private const string PackagesFolder = "packages";
 
         // This value is automatically updated by "build.ps1" script.
-        private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\17.0.0-preview-20210520-02";
+        private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\16.10.0";
         private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";
 
         /// <summary>