diff --git a/eng/SourceBuild.Version.Details.xml b/eng/SourceBuild.Version.Details.xml
index c57083356..38d75de8f 100644
--- a/eng/SourceBuild.Version.Details.xml
+++ b/eng/SourceBuild.Version.Details.xml
@@ -32,6 +32,11 @@
       <SourceBuild RepoName="linker" ManagedOnly="true" />
       <RepoName>linker</RepoName>
     </Dependency>
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210629-04" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/microsoft/vstest</Uri>
+      <Sha>e078bbadaf65628c313e97041973db52a84491ef</Sha>
+      <SourceBuild RepoName="vstest" ManagedOnly="true" />
+    </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="5.0.0-preview.21302.1">
       <Uri>https://github.com/dotnet/xdt</Uri>
       <Sha>6a46e7c886cdf499ba3433f665ab417be814135e</Sha>
diff --git a/src/SourceBuild/tarball/content/patches/vstest/0001-Condition-win7-x86-RID.patch b/src/SourceBuild/tarball/content/patches/vstest/0001-Condition-win7-x86-RID.patch
new file mode 100644
index 000000000..143becaed
--- /dev/null
+++ b/src/SourceBuild/tarball/content/patches/vstest/0001-Condition-win7-x86-RID.patch
@@ -0,0 +1,26 @@
+From 0fc9ffcb249411f9911a6e13f939eaf95bf219c8 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Wed, 7 Jul 2021 20:57:34 +0000
+Subject: [PATCH] Condition win7-x86 RID
+
+Eliminate build errors from source-build building for linux RIDs
+---
+ src/SettingsMigrator/SettingsMigrator.csproj | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj
+index 4f9f6a30..528ed1a4 100644
+--- a/src/SettingsMigrator/SettingsMigrator.csproj
++++ b/src/SettingsMigrator/SettingsMigrator.csproj
+@@ -15,7 +15,7 @@
+     <PlatformTarget>AnyCPU</PlatformTarget>
+     <Prefer32Bit>true</Prefer32Bit>
+   </PropertyGroup>
+-  <PropertyGroup>
++  <PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
+     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
+   </PropertyGroup>
+   <ItemGroup>
+-- 
+2.26.2
+
diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj
index f825a5e06..0b9002198 100644
--- a/src/SourceBuild/tarball/content/repos/known-good.proj
+++ b/src/SourceBuild/tarball/content/repos/known-good.proj
@@ -47,6 +47,7 @@
 
         <!-- Tier 4 -->
         <RepositoryReference Include="fsharp" />
+        <RepositoryReference Include="vstest" />
 
         <!-- Package source-build artifacts -->
         <RepositoryReference Include="package-source-build" />
diff --git a/src/SourceBuild/tarball/content/repos/vstest.proj b/src/SourceBuild/tarball/content/repos/vstest.proj
index d111a824d..bb61facd7 100644
--- a/src/SourceBuild/tarball/content/repos/vstest.proj
+++ b/src/SourceBuild/tarball/content/repos/vstest.proj
@@ -2,17 +2,8 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
-    <OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
-
-    <BuildCommandArgs>-DotNetBuildFromSource</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) -DotNetCoreSdkDir $(DotNetCliToolDir)</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) -c $(Configuration)</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) -r $(OverrideTargetRid)</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) -v $(OutputPackageVersion)</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
-
-    <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
+    <BuildCommandArgs>$(StandardSourceBuildArgs) /p:SemanticVersioningV1=true</BuildCommandArgs>
+    <BuildCommand>$(ProjectDirectory)\eng\common\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
 
     <RepoApiImplemented>false</RepoApiImplemented>
     <DeterministicBuildOptOut>true</DeterministicBuildOptOut>
@@ -20,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
     <RepositoryReference Include="diagnostics" />
-    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="newtonsoft-json" />
+    <!-- TODO:  Enable with https://github.com/dotnet/source-build/issues/2275
+    <RepositoryReference Include="runtime" /> -->
+    <RepositoryReference Include="source-build" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />