diff --git a/test/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs b/test/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs
index 683d2f90dd7e..8306f8ac7a02 100644
--- a/test/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs
+++ b/test/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs
@@ -5,13 +5,14 @@
 
 namespace Microsoft.DotNet.TemplateLocator.Tests
 {
+    [TestClass]
     public class GivenAnTemplateLocator : SdkTest
     {
         private readonly TemplateLocator _resolver;
         private readonly string _manifestDirectory;
         private readonly string _fakeDotnetRootDirectory;
 
-        public GivenAnTemplateLocator(ITestOutputHelper logger) : base(logger)
+        public GivenAnTemplateLocator()
         {
             _resolver = new TemplateLocator(Environment.GetEnvironmentVariable, null, VSSettings.Ambient, null, null);
             _fakeDotnetRootDirectory =
@@ -28,7 +29,7 @@ public GivenAnTemplateLocator(ITestOutputHelper logger) : base(logger)
 
         }
 
-        [Fact]
+        [TestMethod]
         public void ItShouldReturnListOfTemplates()
         {
             Directory.CreateDirectory(Path.Combine(_manifestDirectory, "Android"));
@@ -49,7 +50,7 @@ public void ItShouldReturnListOfTemplates()
             result.Should().HaveCount(1);
         }
 
-        [Fact]
+        [TestMethod]
         public void GivenNoSdkToBondItShouldReturnEmpty()
         {
             Directory.CreateDirectory(Path.Combine(_manifestDirectory, "Android"));
@@ -60,7 +61,7 @@ public void GivenNoSdkToBondItShouldReturnEmpty()
             result.Should().BeEmpty();
         }
 
-        [Fact]
+        [TestMethod]
         public void GivenNoManifestDirectoryItShouldReturnEmpty()
         {
             var fakeDotnetRootDirectory =
diff --git a/test/Microsoft.DotNet.TemplateLocator.Tests/Microsoft.DotNet.TemplateLocator.Tests.csproj b/test/Microsoft.DotNet.TemplateLocator.Tests/Microsoft.DotNet.TemplateLocator.Tests.csproj
index 06cc40d7fe5a..3eb0e2258691 100644
--- a/test/Microsoft.DotNet.TemplateLocator.Tests/Microsoft.DotNet.TemplateLocator.Tests.csproj
+++ b/test/Microsoft.DotNet.TemplateLocator.Tests/Microsoft.DotNet.TemplateLocator.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net472;$(SdkTargetFramework)</TargetFrameworks>
@@ -6,7 +6,6 @@
     <!-- For product build, the .NET Framework TFM only builds in the second build pass as it depends on assets from other
          verticals that are built in the first build pass. -->
     <TargetFrameworks Condition="'$(DotNetBuild)' == 'true' and '$(DotNetBuildPass)' != '2'">$(SdkTargetFramework)</TargetFrameworks>
-    <OutputType Condition="'$(TargetFramework)' == '$(SdkTargetFramework)'">Exe</OutputType>
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
 
     <!-- By default test projects don't append TargetFramework to output path, but for multi-targeted tests
@@ -18,7 +17,11 @@
     <ProjectReference Include="..\..\src\Microsoft.DotNet.TemplateLocator\Microsoft.DotNet.TemplateLocator.csproj" />
     <ProjectReference Include="..\..\src\Resolvers\Microsoft.DotNet.SdkResolver\Microsoft.DotNet.SdkResolver.csproj" />
     <ProjectReference Include="..\..\src\Resolvers\Microsoft.NET.Sdk.WorkloadManifestReader\Microsoft.NET.Sdk.WorkloadManifestReader.csproj" />
-    <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
+    <ProjectReference Include="..\Microsoft.NET.TestFramework.MSTest\Microsoft.NET.TestFramework.MSTest.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.NET.TestFramework" />
   </ItemGroup>
 
   <ItemGroup>