diff --git a/BuildAndTest.proj b/BuildAndTest.proj
index e8170649afc377e65de67bb167f38ec2208f67ef..3a2cb288ca0aa6511004884f11200c43fb689ce0 100644
--- a/BuildAndTest.proj
+++ b/BuildAndTest.proj
@@ -104,7 +104,9 @@
       <RunTestsArgs>$(NuGetPackageRoot)\xunit.runner.console\$(xunitrunnerconsoleVersion)\tools $(RunTestArgs) @(TestAssemblies, ' ')</RunTestsArgs>
     </PropertyGroup>
     
+    <!--
     <Exec Condition="'$(RunProcessWatchdog)' != 'true' AND '$(TestVsi)' != 'true'" Command="&quot;$(CoreRunExe)&quot; $(CoreRunArgs)" />
+    -->
 
     <Exec Condition="'$(RunProcessWatchdog)' != 'true'" Command="&quot;$(RunTestsExe)&quot; $(RunTestsArgs)" />
 
diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index efdeffba7d72ea4ed1bda33a00802010b7dcca81..37f546c24c6c62e8989a70d489f1b17662fdf589 100644
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -8,19 +8,9 @@
         <OutDir>$(OutDir)Exes\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
-    <When Condition="'$(RoslynProjectType)' == 'UnitTestFixed'">
-      <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
-      </PropertyGroup>
-    </When>
     <When Condition="'$(RoslynProjectType)' == 'UnitTest'">
       <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\Current\</OutDir>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(RoslynProjectType)' == 'UnitTestNext'">
-      <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\Next\</OutDir>
+        <OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
     <When Condition="'$(RoslynProjectType)' == 'UnitTestPortable'">
diff --git a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj
index ac7bbf40a8c8ba1e4e574af7d31e72293e1d2157..28fbf171988aa64261d591a76598079a582183ff 100644
--- a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj
+++ b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <ForceGenerationOfBindingRedirects>true</ForceGenerationOfBindingRedirects>
-    <RoslynProjectType>UnitTestNext</RoslynProjectType>
+    <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
@@ -200,4 +200,4 @@
   </ItemGroup>
   <Import Project="..\..\..\..\build\Targets\Imports.targets" />
   <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
-</Project>
\ No newline at end of file
+</Project>