diff --git a/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.props b/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.props
index e520741fa3..dd795d4f0d 100644
--- a/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.props
+++ b/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.props
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
-<Project>  
+<Project>
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU5125;NU3005</NoWarn>
 
@@ -8,16 +8,12 @@
   </PropertyGroup>
 
   <!-- Recognize MSTest projects -->
-  <PropertyGroup Condition="'$(IsUnitTestProject)' == '' and ($(MSBuildProjectName.EndsWith('.MSTest.UnitTests')) or $(MSBuildProjectName.EndsWith('.MSTest.Tests')))">
-    <IsUnitTestProject>true</IsUnitTestProject>
-    <UsingToolXUnit>false</UsingToolXUnit>
+  <PropertyGroup Condition="'$(TestRunnerName)' == '' and ($(MSBuildProjectName.EndsWith('.MSTest.UnitTests')) or $(MSBuildProjectName.EndsWith('.MSTest.Tests')))">
     <TestRunnerName>MSTest</TestRunnerName>
   </PropertyGroup>
 
   <!-- Recognize NUnit projects -->
-  <PropertyGroup Condition="'$(IsUnitTestProject)' == '' and ($(MSBuildProjectName.EndsWith('.NUnit.UnitTests')) or $(MSBuildProjectName.EndsWith('.NUnit.Tests')))">
-    <IsUnitTestProject>true</IsUnitTestProject>
-    <UsingToolXUnit>false</UsingToolXUnit>
+  <PropertyGroup Condition="'$(TestRunnerName)' == '' and ($(MSBuildProjectName.EndsWith('.NUnit.UnitTests')) or $(MSBuildProjectName.EndsWith('.NUnit.Tests')))">
     <TestRunnerName>NUnit</TestRunnerName>
   </PropertyGroup>
 
@@ -37,9 +33,6 @@
     <NUnit3TestAdapterVersion Condition="'$(NUnit3TestAdapterVersion)' == ''">3.15.1</NUnit3TestAdapterVersion>
   </PropertyGroup>
 
-  <!-- Import specialized props files of supported test runners -->
-  <Import Project="$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).props" Condition="'$(TestRunnerName)' != '' and Exists('$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).props')"/>
-
   <PropertyGroup>
     <TestTargetFrameworks>netcoreapp3.1;net472;net46;netcoreapp1.1;netcoreapp2.0</TestTargetFrameworks>
 
@@ -71,7 +64,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\RoslynSDK.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" PrivateAssets="all" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)..\..\stylecop.json" Link="stylecop.json" />
diff --git a/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.targets b/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.targets
index b74217fee4..c70b0af6f8 100644
--- a/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.targets
+++ b/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.targets
@@ -1,11 +1,8 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <ItemGroup Condition="'$(UsingToolXUnit)' == 'true' and '$(IsUnitTestProject)' == 'true'">
+  <ItemGroup Condition="'$(TestRunnerName)' == 'XUnit' and '$(IsUnitTestProject)' == 'true'">
     <PackageReference Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
-  <!-- Import specialized targets files of supported test runners -->
-  <Import Project="$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).targets" Condition="'$(TestRunnerName)' != '' and Exists('$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).targets')"/>
 </Project>
\ No newline at end of file
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.props b/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.props
deleted file mode 100644
index 8c119d5413..0000000000
--- a/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.props
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project>
-</Project>
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.targets b/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.targets
deleted file mode 100644
index a8967a255b..0000000000
--- a/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.targets
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
-<Project>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.TestPlatform" Version="$(MicrosoftTestPlatformVersion)" GeneratePathProperty="true" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true"/>
-    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true"/>
-    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true"/>
-  </ItemGroup>
-
-  <!-- 
-    Include '*' target to force running tests even if the input assemblies haven't changed and the outputs are present.
-    This matches the common expectations that test command always runs all tests in scope.
-  -->
-  <Target Name="RunTests"
-          Inputs="@(TestToRun);*"
-          Outputs="%(TestToRun.ResultsStdOutPath);%(TestToRun.ResultsXmlPath)">
-    <Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Test" />
-    <PropertyGroup>
-      <_TestEnvironment>%(TestToRun.EnvironmentDisplay)</_TestEnvironment>
-      <_TestAssembly>%(TestToRun.Identity)</_TestAssembly>
-      <_TestRuntime>%(TestToRun.TestRuntime)</_TestRuntime>
-      <_TestTimeout>%(TestToRun.TestTimeout)</_TestTimeout>
-      <_TestRunnerAdditionalArguments>%(TestToRun.TestRunnerAdditionalArguments)</_TestRunnerAdditionalArguments>
-
-      <_TestRunnerTargetFramework>net451</_TestRunnerTargetFramework>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <_MSTestConsoleExe>vstest.console.exe</_MSTestConsoleExe>
-      <_MSTestConsoleExePath>$(NuGetPackageRoot)microsoft.testplatform/$(MicrosoftTestPlatformVersion)/tools/$(_TestRunnerTargetFramework)/Common7/IDE/Extensions/TestPlatform/$(_MSTestConsoleExe)</_MSTestConsoleExePath>
-
-      <!-- TODO: is _TestRunnerArgs correct? -->
-      <_TestRunnerArgs>"$(_TestAssembly)" /Platform:%(TestToRun.Architecture) /Framework:%(TestToRun.TargetFramework) /Logger:trx;LogFileName="%(TestToRun.ResultsXmlPath)" $(_TestRunnerAdditionalArguments)</_TestRunnerArgs>
-      <_TestRunnerArgs Condition="'$(_TestRuntime)' == 'Mono'">$(TestRuntimeAdditionalArguments) "$(_MSTestConsoleExePath)" $(_TestRunnerArgs)</_TestRunnerArgs>
-
-      <!-- TODO: is _TestRunner correct? -->
-      <_TestRunner Condition="'$(_TestRuntime)' == 'Mono'">$(MonoTool)</_TestRunner>
-      <_TestRunner Condition="'$(_TestRuntime)' != 'Mono'">$(_MSTestConsoleExePath)</_TestRunner>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <_TestRunnerCommand>"$(_TestRunner)" $(_TestRunnerArgs)</_TestRunnerCommand>
-
-      <!-- 
-        Redirect std output of the runner.
-        TODO: is MSTest the same as xUnit with respect to outputs?
-        Note that xUnit outputs failure info to both STDOUT (stack trace, message) and STDERR (failed test name) 
-      -->
-      <_TestRunnerCommand Condition="'$(TestCaptureOutput)' != 'false'">$(_TestRunnerCommand) > "%(TestToRun.ResultsStdOutPath)" 2>&amp;1</_TestRunnerCommand>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- TODO: is _OutputFiles correct? -->
-      <_OutputFiles Include="%(TestToRun.ResultsXmlPath)" />
-      <_OutputFiles Include="%(TestToRun.ResultsStdOutPath)" />
-    </ItemGroup>
-
-    <MakeDir Directories="@(_OutputFiles->'%(RootDir)%(Directory)')"/>
-    <Delete Files="@(_OutputFiles)" />
-
-    <Message Text="Running tests: $(_TestAssembly) [$(_TestEnvironment)]" Importance="high"/>
-    <Exec Command='$(_TestRunnerCommand)'
-          LogStandardErrorAsError="false"
-          WorkingDirectory="$(_TargetDir)"
-          IgnoreExitCode="true"
-          Timeout="$(_TestTimeout)"
-          ContinueOnError="WarnAndContinue">
-      <Output TaskParameter="ExitCode" PropertyName="_TestErrorCode" />
-    </Exec>
-
-    <!--
-      Add command line to the log.
-    -->
-    <WriteLinesToFile File="%(TestToRun.ResultsStdOutPath)"
-                      Overwrite="false"
-                      Lines=";=== COMMAND LINE ===;$(_TestRunnerCommand)"
-                      Condition="'$(TestCaptureOutput)' != 'false'" />
-
-    <!--
-      Report test status.
-    -->
-    <Message Text="Tests succeeded: $(_TestAssembly) [$(_TestEnvironment)]" Condition="'$(_TestErrorCode)' == '0'" Importance="high" />
-
-    <PropertyGroup>
-      <_ResultsFileToDisplay>%(TestToRun.ResultsHtmlPath)</_ResultsFileToDisplay>
-      <_ResultsFileToDisplay Condition="!Exists('$(_ResultsFileToDisplay)')">%(TestToRun.ResultsStdOutPath)</_ResultsFileToDisplay>
-    </PropertyGroup>
-
-    <!-- 
-      Ideally we would set ContinueOnError="ErrorAndContinue" so that when a test fails in multi-targeted test project
-      we'll still run tests for all target frameworks. ErrorAndContinue doesn't work well on Linux though: https://github.com/Microsoft/msbuild/issues/3961.
-    -->
-    <Error Text="Tests failed: $(_ResultsFileToDisplay) [$(_TestEnvironment)]" Condition="'$(_TestErrorCode)' != '0'" File="MSTest" />
-
-    <ItemGroup>
-      <FileWrites Include="@(_OutputFiles)"/>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.props b/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.props
deleted file mode 100644
index 736332286e..0000000000
--- a/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
-<Project>
-</Project>
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.targets b/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.targets
deleted file mode 100644
index 7720be5d22..0000000000
--- a/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.targets
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
-<Project>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.TestPlatform" Version="$(MicrosoftTestPlatformVersion)" GeneratePathProperty="true" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true"/>
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true"/>
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapterVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true"/>
-  </ItemGroup>
-
-  <!-- 
-    Include '*' target to force running tests even if the input assemblies haven't changed and the outputs are present.
-    This matches the common expectations that test command always runs all tests in scope.
-  -->
-  <Target Name="RunTests"
-          Inputs="@(TestToRun);*"
-          Outputs="%(TestToRun.ResultsStdOutPath);%(TestToRun.ResultsXmlPath)">
-    <Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Test" />
-    <PropertyGroup>
-      <_TestEnvironment>%(TestToRun.EnvironmentDisplay)</_TestEnvironment>
-      <_TestAssembly>%(TestToRun.Identity)</_TestAssembly>
-      <_TestRuntime>%(TestToRun.TestRuntime)</_TestRuntime>
-      <_TestTimeout>%(TestToRun.TestTimeout)</_TestTimeout>
-      <_TestRunnerAdditionalArguments>%(TestToRun.TestRunnerAdditionalArguments)</_TestRunnerAdditionalArguments>
-
-      <_TestRunnerTargetFramework>net451</_TestRunnerTargetFramework>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <_VSTestConsoleExe>vstest.console.exe</_VSTestConsoleExe>
-      <_VSTestConsoleExePath>$(NuGetPackageRoot)microsoft.testplatform/$(MicrosoftTestPlatformVersion)/tools/$(_TestRunnerTargetFramework)/Common7/IDE/Extensions/TestPlatform/$(_VSTestConsoleExe)</_VSTestConsoleExePath>
-
-      <!-- TODO: is _TestRunnerArgs correct? -->
-      <_TestRunnerArgs>"$(_TestAssembly)" /Platform:%(TestToRun.Architecture) /Framework:%(TestToRun.TargetFramework) /Logger:trx;LogFileName="%(TestToRun.ResultsXmlPath)" $(_TestRunnerAdditionalArguments)</_TestRunnerArgs>
-      <_TestRunnerArgs Condition="'$(_TestRuntime)' == 'Mono'">$(TestRuntimeAdditionalArguments) "$(_VSTestConsoleExePath)" $(_TestRunnerArgs)</_TestRunnerArgs>
-
-      <!-- TODO: is _TestRunner correct? -->
-      <_TestRunner Condition="'$(_TestRuntime)' == 'Mono'">$(MonoTool)</_TestRunner>
-      <_TestRunner Condition="'$(_TestRuntime)' != 'Mono'">$(_VSTestConsoleExePath)</_TestRunner>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <_TestRunnerCommand>"$(_TestRunner)" $(_TestRunnerArgs)</_TestRunnerCommand>
-
-      <!-- 
-        Redirect std output of the runner.
-        TODO: is NUnit the same as xUnit with respect to outputs?
-        Note that xUnit outputs failure info to both STDOUT (stack trace, message) and STDERR (failed test name) 
-      -->
-      <_TestRunnerCommand Condition="'$(TestCaptureOutput)' != 'false'">$(_TestRunnerCommand) > "%(TestToRun.ResultsStdOutPath)" 2>&amp;1</_TestRunnerCommand>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_OutputFiles Include="%(TestToRun.ResultsXmlPath)" />
-      <_OutputFiles Include="%(TestToRun.ResultsStdOutPath)" />
-    </ItemGroup>
-
-    <MakeDir Directories="@(_OutputFiles->'%(RootDir)%(Directory)')"/>
-    <Delete Files="@(_OutputFiles)" />
-
-    <Message Text="Running tests: $(_TestAssembly) [$(_TestEnvironment)]" Importance="high"/>
-    <Exec Command='$(_TestRunnerCommand)'
-          LogStandardErrorAsError="false"
-          WorkingDirectory="$(_TargetDir)"
-          IgnoreExitCode="true"
-          Timeout="$(_TestTimeout)"
-          ContinueOnError="WarnAndContinue">
-      <Output TaskParameter="ExitCode" PropertyName="_TestErrorCode" />
-    </Exec>
-
-    <!--
-      Add command line to the log.
-    -->
-    <WriteLinesToFile File="%(TestToRun.ResultsStdOutPath)"
-                      Overwrite="false"
-                      Lines=";=== COMMAND LINE ===;$(_TestRunnerCommand)"
-                      Condition="'$(TestCaptureOutput)' != 'false'" />
-
-    <!--
-      Report test status.
-    -->
-    <Message Text="Tests succeeded: $(_TestAssembly) [$(_TestEnvironment)]" Condition="'$(_TestErrorCode)' == '0'" Importance="high" />
-
-    <PropertyGroup>
-      <_ResultsFileToDisplay>%(TestToRun.ResultsHtmlPath)</_ResultsFileToDisplay>
-      <_ResultsFileToDisplay Condition="!Exists('$(_ResultsFileToDisplay)')">%(TestToRun.ResultsStdOutPath)</_ResultsFileToDisplay>
-    </PropertyGroup>
-
-    <!-- 
-      Ideally we would set ContinueOnError="ErrorAndContinue" so that when a test fails in multi-targeted test project
-      we'll still run tests for all target frameworks. ErrorAndContinue doesn't work well on Linux though: https://github.com/Microsoft/msbuild/issues/3961.
-    -->
-    <Error Text="Tests failed: $(_ResultsFileToDisplay) [$(_TestEnvironment)]" Condition="'$(_TestErrorCode)' != '0'" File="NUnit" />
-
-    <ItemGroup>
-      <FileWrites Include="@(_OutputFiles)"/>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/tests/VisualStudio.Roslyn.SDK/Directory.Build.targets b/tests/VisualStudio.Roslyn.SDK/Directory.Build.targets
index 5ddf69387d..4884c0c1f0 100644
--- a/tests/VisualStudio.Roslyn.SDK/Directory.Build.targets
+++ b/tests/VisualStudio.Roslyn.SDK/Directory.Build.targets
@@ -1,6 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <ItemGroup Condition="'$(UsingToolXUnit)' == 'true' and '$(IsUnitTestProject)' == 'true'">
+  <ItemGroup Condition="'$(TestRunnerName)' == 'XUnit' and '$(IsUnitTestProject)' == 'true'">
     <PackageReference Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
   </ItemGroup>