diff --git a/BuildAndTest.proj b/BuildAndTest.proj
index 2a011fe2f8f68e4a3c37fb728f0896d5886a77e6..f2fac6687f7a7884abfadb28f2bd19d248e58a44 100644
--- a/BuildAndTest.proj
+++ b/BuildAndTest.proj
@@ -75,6 +75,7 @@
 
     <!-- Publish binaries for CoreClr test -->
     <MSBuild BuildInParallel="true"
+             Condition="'$(TestCoreClr)' == 'true'"
              Projects="src\Test\DeployCoreClrTestRuntime\DeployCoreClrTestRuntime.csproj"
              Properties="RuntimeIdentifier=win7-x64;PublishDir=$(CoreClrTestDirectory)"
              Targets="Publish" />
diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index 1cebf68b6ee364f4e62b1af255bcecb21c8c679a..e8a21ed177ed6e0bf6f413e413e738447da08841 100644
--- a/build/scripts/build.ps1
+++ b/build/scripts/build.ps1
@@ -40,7 +40,7 @@ function Run-Build() {
 
 function Run-Test() {
     $proj = Join-Path $repoDir "BuildAndTest.proj"
-    $args = "/v:m /p:SkipCoreClr=true /p:ManualTest=true /t:Test /p:Test32=true $proj"
+    $args = "/v:m /p:ManualTest=true /t:Test /p:TestDesktop=true $proj"
     if ($test64) { 
         $args += " /p:Test64=true"
     }