diff --git a/build.ps1 b/build.ps1
index 8aae04cb2..f3b5c5b11 100644
--- a/build.ps1
+++ b/build.ps1
@@ -636,19 +636,13 @@ function Build-XCTest($Arch)
     -UseBuiltCompilers Swift `
     -BuildDefaultTarget `
     -Defines @{
+      CMAKE_INSTALL_BINDIR = $Arch.BinaryDir;
       CMAKE_SYSTEM_NAME = "Windows";
       CMAKE_SYSTEM_PROCESSOR = $Arch.CMakeName;
       dispatch_DIR = "$DispatchBinDir\cmake\modules";
       Foundation_DIR = "$FoundationBinDir\cmake\modules";
     }
 
-  # Restructure Runtime
-  Remove-Item -Recurse -Force -ErrorAction Ignore `
-    $InstallDir\$($Arch.BinaryDir)
-  Move-Item -Force `
-    $InstallDir\bin `
-    $InstallDir\$($Arch.BinaryDir)
-
   # Restructure Import Libraries
   New-Item -ErrorAction Ignore -Type Directory `
     -Path $InstallDir\lib\swift\windows\$($Arch.LLVMName)