diff --git a/OpenConsole.sln b/OpenConsole.sln
index c4241b6e9..892383ddf 100644
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -71,7 +71,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Unit", "src\host
{06EC74CB-9A12-429C-B551-8562EC954747} = {06EC74CB-9A12-429C-B551-8562EC954747}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextBuffer.UnitTests", "src\buffer\out\ut_textbuffer\TextBuffer.UnitTests.vcxproj", "{531C23E7-4B76-4C08-8BBD-04164CB628C9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextBuffer.Unit.Tests", "src\buffer\out\ut_textbuffer\TextBuffer.Unit.Tests.vcxproj", "{531C23E7-4B76-4C08-8BBD-04164CB628C9}"
ProjectSection(ProjectDependencies) = postProject
{0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {0CF235BD-2DA0-407E-90EE-C467E8BBC714}
EndProjectSection
diff --git a/src/buffer/out/ut_textbuffer/TextBuffer.Unittests.vcxproj b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj
similarity index 90%
rename from src/buffer/out/ut_textbuffer/TextBuffer.Unittests.vcxproj
rename to src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj
index e763c0f91..2998c3460 100644
--- a/src/buffer/out/ut_textbuffer/TextBuffer.Unittests.vcxproj
+++ b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj
@@ -21,8 +21,8 @@
{531C23E7-4B76-4C08-8BBD-04164CB628C9}
Win32Proj
TextBufferUnitTests
- TextBuffer.UnitTests
- TextBuffer.UnitTests
+ TextBuffer.Unit.Tests
+ TextBuffer.Unit.Tests
diff --git a/tools/runft.cmd b/tools/runft.cmd
index bddc6230e..f2632c886 100644
--- a/tools/runft.cmd
+++ b/tools/runft.cmd
@@ -1,6 +1,7 @@
@echo off
rem Run the console feature tests.
+rem Keep this file in sync with tests.xml
call %TAEF% ^
%OPENCON%\bin\%ARCH%\Debug\ConHost.Feature.Tests.dll ^
diff --git a/tools/runuia.cmd b/tools/runuia.cmd
index 8b6501769..2ab2625a6 100644
--- a/tools/runuia.cmd
+++ b/tools/runuia.cmd
@@ -1,6 +1,7 @@
@echo off
rem Run the console UI Automation tests.
+rem Keep this file in sync with tests.xml
rem Get AppDriver going first... You'll have to close it yourself.
diff --git a/tools/runut.cmd b/tools/runut.cmd
index 51dffb5e0..1f9ade743 100644
--- a/tools/runut.cmd
+++ b/tools/runut.cmd
@@ -1,10 +1,11 @@
@echo off
rem Run the console unit tests.
+rem Keep this file in sync with tests.xml
call %TAEF% ^
%OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Conhost.Unit.Tests.dll ^
- %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\TextBuffer.Unittests.dll ^
+ %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\TextBuffer.Unit.Tests.dll ^
%OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Terminal.Core.Unit.Tests.dll ^
%OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Conhost.Interactivity.Win32.Unit.Tests.dll ^
%OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\ConParser.Unit.Tests.dll ^
diff --git a/tools/tests.xml b/tools/tests.xml
index 3a64144b8..05a8b4d83 100644
--- a/tools/tests.xml
+++ b/tools/tests.xml
@@ -1,7 +1,8 @@
-
+
-
+
+