diff --git a/src/SourceBuild/content/eng/unifiedBuildValidation.targets b/src/SourceBuild/content/eng/unifiedBuildValidation.targets
index b180b6572..2796305e2 100644
--- a/src/SourceBuild/content/eng/unifiedBuildValidation.targets
+++ b/src/SourceBuild/content/eng/unifiedBuildValidation.targets
@@ -9,18 +9,22 @@
           AfterTargets="Build"
           DependsOnTargets="DetermineSourceBuiltSdkVersion">
 
+    <ItemGroup>
+      <_UnifiedBuildValidationEnvVar Include="UNIFIED_BUILD_VALIDATION_SDK_TARBALL_PATH" Value="$(SdkTarballPath)" />
+      <_UnifiedBuildValidationEnvVar Include="UNIFIED_BUILD_VALIDATION_TARGET_RID" Value="$(TargetRid)" />
+      <_UnifiedBuildValidationEnvVar Include="UNIFIED_BUILD_VALIDATION_PORTABLE_RID" Value="$(PortableRid)" />
+      <_UnifiedBuildValidationEnvVar Include="UNIFIED_BUILD_VALIDATION_BUILD_VERSION" Value="$(SourceBuiltSdkVersion)" />
+    </ItemGroup>
+
     <PropertyGroup>
       <SdkTarballPath>%(SdkTarballItem.Identity)</SdkTarballPath>
+      <_EnvVarRunSettingsPrefix>RunConfiguration.EnvironmentVariables</_EnvVarRunSettingsPrefix>
+      <EnvironmentVariableRunSettings>@(_UnifiedBuildValidationEnvVar->'$(RunConfiguration.EnvironmentVariables).%(Identity)=%(Value)')</EnvironmentVariableRunSettings>
     </PropertyGroup>
 
-    <Exec Command="$(DotnetTool) test $(UnifiedBuildValidationTestsDir) --logger:trx -c $(Configuration) -p:VSTestUseMSBuildOutput=false"
-          IgnoreStandardErrorWarningFormat="true"
-          EnvironmentVariables="
-            UNIFIED_BUILD_VALIDATION_SDK_TARBALL_PATH=$(SdkTarballPath);
-            UNIFIED_BUILD_VALIDATION_TARGET_RID=$(TargetRid);
-            UNIFIED_BUILD_VALIDATION_PORTABLE_RID=$(PortableRid);
-            UNIFIED_BUILD_VALIDATION_BUILD_VERSION=$(SourceBuiltSdkVersion);
-            $(CustomTestEnvVars)" />
+    <MSBuild Projects="$(UnifiedBuildValidationTestsDir)"
+             Targets="Test"
+             Properties="Configuration=$(Configuration);VSTestUseMSBuildOutput=false;VSTestLogger=trx;VSTestCLIRunSettings=$(EnvironmentVariableRunSettings)" />
 
   </Target>
 
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index 25bf82b69..78459f997 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -148,6 +148,6 @@
           UseHardlinksIfPossible="true" />
   </Target>
 
-  <Import Project="$(RepositoryEngineeringDir)unifiedBuildValidation.targets" Condition="'$(ShortStack)' != 'true' and '$(PortableBuild)' == 'true' and '$(PgoInstrument)' != 'true'" />
+  <Import Project="$(RepositoryEngineeringDir)unifiedBuildValidation.targets" Condition="'$(PortableBuild)' == 'true' and '$(PgoInstrument)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" />
 
 </Project>
diff --git a/src/SourceBuild/content/test/Directory.Build.props b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Directory.Build.props
similarity index 100%
rename from src/SourceBuild/content/test/Directory.Build.props
rename to src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Directory.Build.props