diff --git a/packaging/windows/generatemsi.ps1 b/packaging/windows/generatemsi.ps1
index ce1c09d46..7f6774a56 100644
--- a/packaging/windows/generatemsi.ps1
+++ b/packaging/windows/generatemsi.ps1
@@ -243,7 +243,7 @@ if(!(Test-Path $DotnetBundleOutput))
 Write-Host -ForegroundColor Green "Successfully created dotnet MSI - $DotnetMSIOutput"
 Write-Host -ForegroundColor Green "Successfully created dotnet bundle - $DotnetBundleOutput"
 
-_ $PSScriptRoot\testmsi.ps1 @("$DotnetMSIOutput")
+_ $RepoRoot\test\Installer\testmsi.ps1 @("$DotnetMSIOutput")
 
 $PublishScript = Join-Path $PSScriptRoot "..\..\scripts\publish\publish.ps1"
 & $PublishScript -file $DotnetMSIOutput
diff --git a/scripts/test/restore-tests.ps1 b/scripts/test/restore-tests.ps1
index 870e54bf5..48d1dd5e7 100644
--- a/scripts/test/restore-tests.ps1
+++ b/scripts/test/restore-tests.ps1
@@ -8,4 +8,4 @@
 info "Restoring Test Projects"
 
 # Restore packages
-& dotnet restore "$RepoRoot\test" -f "$TestPackageDir\Debug"
+& dotnet restore "$RepoRoot\test" -f "$TestPackageDir"
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/Dotnet.Cli.Msi.Tests.csproj b/test/Installer/Dotnet.Cli.Msi.Tests/Dotnet.Cli.Msi.Tests.csproj
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/Dotnet.Cli.Msi.Tests.csproj
rename to test/Installer/Dotnet.Cli.Msi.Tests/Dotnet.Cli.Msi.Tests.csproj
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/InstallFixture.cs b/test/Installer/Dotnet.Cli.Msi.Tests/InstallFixture.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/InstallFixture.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/InstallFixture.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/InstallationTests.cs b/test/Installer/Dotnet.Cli.Msi.Tests/InstallationTests.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/InstallationTests.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/InstallationTests.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/MsiManager.cs b/test/Installer/Dotnet.Cli.Msi.Tests/MsiManager.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/MsiManager.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/MsiManager.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/PostInstallTests.cs b/test/Installer/Dotnet.Cli.Msi.Tests/PostInstallTests.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/PostInstallTests.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/PostInstallTests.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/PostUninstallTests.cs b/test/Installer/Dotnet.Cli.Msi.Tests/PostUninstallTests.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/PostUninstallTests.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/PostUninstallTests.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/Program.cs b/test/Installer/Dotnet.Cli.Msi.Tests/Program.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/Program.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/Program.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/Properties/AssemblyInfo.cs b/test/Installer/Dotnet.Cli.Msi.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/Properties/AssemblyInfo.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/Properties/AssemblyInfo.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/Utils.cs b/test/Installer/Dotnet.Cli.Msi.Tests/Utils.cs
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/Utils.cs
rename to test/Installer/Dotnet.Cli.Msi.Tests/Utils.cs
diff --git a/packaging/windows/Dotnet.Cli.Msi.Tests/project.json b/test/Installer/Dotnet.Cli.Msi.Tests/project.json
similarity index 100%
rename from packaging/windows/Dotnet.Cli.Msi.Tests/project.json
rename to test/Installer/Dotnet.Cli.Msi.Tests/project.json
diff --git a/packaging/windows/testmsi.ps1 b/test/Installer/testmsi.ps1
similarity index 92%
rename from packaging/windows/testmsi.ps1
rename to test/Installer/testmsi.ps1
index b73d81266..ea329d8a9 100644
--- a/packaging/windows/testmsi.ps1
+++ b/test/Installer/testmsi.ps1
@@ -21,6 +21,7 @@ if(!(Test-Path $inputMsi))
 }
 
 $env:CLI_MSI=$inputMsi
+$testDir="$PSScriptRoot\Dotnet.Cli.Msi.Tests"
 $testBin="$RepoRoot\artifacts\tests\Dotnet.Cli.Msi.Tests"
 $xunitRunner="$env:USERPROFILE\.dnx\packages\xunit.runner.console\2.1.0\tools\xunit.console.exe"
 
@@ -29,7 +30,7 @@ pushd "$Stage2Dir\bin"
 try {
     .\dotnet restore `
         --runtime win-anycpu `
-        $RepoRoot\packaging\windows\Dotnet.Cli.Msi.Tests\project.json `
+        $testDir `
         -f https://www.myget.org/F/dotnet-buildtools/api/v3/index.json | Out-Host
 
     if($LastExitCode -ne 0)
@@ -41,7 +42,7 @@ try {
         --framework net46 `
         --runtime win-anycpu `
         --output $testBin `
-        $RepoRoot\packaging\windows\Dotnet.Cli.Msi.Tests\project.json | Out-Host
+        $testDir | Out-Host
 
     if($LastExitCode -ne 0)
     {