diff --git a/OpenConsole.sln b/OpenConsole.sln
index e94b662f4ac..06bfcb492b7 100644
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -262,7 +262,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHostApp", "src\cascadia
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {CA5CAD1A-9B68-456A-B13E-C8218070DC42}
-		{68A10CD3-AA64-465B-AF5F-ED4E9700543C} = {68A10CD3-AA64-465B-AF5F-ED4E9700543C}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDB237B6-1D1D-400F-84CC-40A58FA59C8E}"
@@ -350,7 +349,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Remoting
 		{43CE4CE5-0010-4B99-9569-672670D26E26} = {43CE4CE5-0010-4B99-9569-672670D26E26}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_Remoting", "src\cascadia\LocalTests_Remoting\Remoting.LocalTests.vcxproj", "{68A10CD3-AA64-465B-AF5F-ED4E9700543C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_Remoting", "src\cascadia\UnitTests_Remoting\Remoting.UnitTests.vcxproj", "{68A10CD3-AA64-465B-AF5F-ED4E9700543C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{43CE4CE5-0010-4B99-9569-672670D26E26} = {43CE4CE5-0010-4B99-9569-672670D26E26}
 		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
diff --git a/build/pipelines/templates/helix-runtests-job.yml b/build/pipelines/templates/helix-runtests-job.yml
index 736bfc5338e..04169e342aa 100644
--- a/build/pipelines/templates/helix-runtests-job.yml
+++ b/build/pipelines/templates/helix-runtests-job.yml
@@ -113,13 +113,6 @@ jobs:
       testSuite: '${{ parameters.testSuite }}'
       taefQuery: ${{ parameters.taefQuery }}
 
-  - template: helix-createprojfile-steps.yml
-    parameters:
-      condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
-      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\Remoting.LocalTests.dll'
-      outputProjFileName: 'RunTestsInHelix-RemotingLocalTests.proj'
-      testSuite: '${{ parameters.testSuite }}'
-      taefQuery: ${{ parameters.taefQuery }}
 
   - template: helix-createprojfile-steps.yml
     parameters:
diff --git a/src/cascadia/UnitTests_Remoting/Remoting.LocalTests.vcxproj b/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj
similarity index 93%
rename from src/cascadia/UnitTests_Remoting/Remoting.LocalTests.vcxproj
rename to src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj
index c91a5d003e8..a151a594027 100644
--- a/src/cascadia/UnitTests_Remoting/Remoting.LocalTests.vcxproj
+++ b/src/cascadia/UnitTests_Remoting/Remoting.UnitTests.vcxproj
@@ -14,9 +14,9 @@
   <PropertyGroup>
     <ProjectGuid>{68a10cd3-aa64-465b-af5f-ed4e9700543c}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>RemotingLocalTests</RootNamespace>
-    <ProjectName>LocalTests_Remoting</ProjectName>
-    <TargetName>Remoting.LocalTests</TargetName>
+    <RootNamespace>RemotingUnitTests</RootNamespace>
+    <ProjectName>UnitTests_Remoting</ProjectName>
+    <TargetName>Remoting.UnitTests</TargetName>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
     <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
diff --git a/src/cascadia/UnitTests_Remoting/LocalTests_Remoting.def b/src/cascadia/UnitTests_Remoting/UnitTests_Remoting.def
similarity index 100%
rename from src/cascadia/UnitTests_Remoting/LocalTests_Remoting.def
rename to src/cascadia/UnitTests_Remoting/UnitTests_Remoting.def
diff --git a/src/cascadia/UnitTests_Remoting/pch.h b/src/cascadia/UnitTests_Remoting/pch.h
index a88cde20a9c..da79b2d4fd8 100644
--- a/src/cascadia/UnitTests_Remoting/pch.h
+++ b/src/cascadia/UnitTests_Remoting/pch.h
@@ -22,7 +22,6 @@ Licensed under the MIT license.
 #include <hstring.h>
 
 #include <WexTestClass.h>
-#include <json.h>
 #include "consoletaeftemplates.hpp"
 
 #include <winrt/Windows.ApplicationModel.Resources.Core.h>
diff --git a/tools/OpenConsole.psm1 b/tools/OpenConsole.psm1
index fda169365c4..fd205c2ba51 100644
--- a/tools/OpenConsole.psm1
+++ b/tools/OpenConsole.psm1
@@ -159,7 +159,7 @@ function Invoke-OpenConsoleTests()
         [switch]$FTOnly,
 
         [parameter(Mandatory=$false)]
-        [ValidateSet('host', 'interactivityWin32', 'terminal', 'adapter', 'feature', 'uia', 'textbuffer', 'til', 'types', 'terminalCore', 'terminalApp', 'localTerminalApp', 'localSettingsModel', 'localRemoting')]
+        [ValidateSet('host', 'interactivityWin32', 'terminal', 'adapter', 'feature', 'uia', 'textbuffer', 'til', 'types', 'terminalCore', 'terminalApp', 'localTerminalApp', 'localSettingsModel', 'unitRemoting')]
         [string]$Test,
 
         [parameter(Mandatory=$false)]
diff --git a/tools/tests.xml b/tools/tests.xml
index 74beb621f15..0a296e21f6d 100644
--- a/tools/tests.xml
+++ b/tools/tests.xml
@@ -6,7 +6,7 @@
   <test name="terminalApp" type="unit" binary="UnitTests_TerminalApp\Terminal.App.Unit.Tests.dll" />
   <test name="localTerminalApp" type="unit" runInHostApp="true" binary="TerminalApp.LocalTests.dll" />
   <test name="localSettingsModel" type="unit" runInHostApp="true" binary="SettingsModel.LocalTests.dll" />
-  <test name="localRemoting" type="unit" runInHostApp="true" binary="Remoting.LocalTests.dll" />
+  <test name="unitRemoting" type="unit" runInHostApp="true" binary="Remoting.UnitTests.dll" />
   <test name="interactivityWin32" type="unit" binary="Conhost.Interactivity.Win32.Unit.Tests.dll" />
   <test name="terminal" type="unit" binary="ConParser.Unit.Tests.dll" />
   <test name="adapter" type="unit" binary="ConAdapter.Unit.Tests.dll" />