diff --git a/PowerToys.sln b/PowerToys.sln
index fa40f8b33e..f0b5ac9825 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -545,7 +545,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvironmentVariables", "src
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EnvironmentVariablesModuleInterface", "src\modules\EnvironmentVariables\EnvironmentVariablesModuleInterface\EnvironmentVariablesModuleInterface.vcxproj", "{B9420661-B0E4-4241-ABD4-4A27A1F64250}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests-FancyZones-WinAppDriver", "src\modules\fancyzones\UnitTests-FancyZones-WinAppDriver\UnitTests-FancyZones-WinAppDriver.csproj", "{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests-FancyZones", "src\modules\fancyzones\UITests-FancyZones\UITests-FancyZones.csproj", "{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/RunFancyZonesTest.cs b/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
similarity index 94%
rename from src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/RunFancyZonesTest.cs
rename to src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
index ecacd07f98..2012913f2a 100644
--- a/src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/RunFancyZonesTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZones/RunFancyZonesTest.cs
@@ -5,7 +5,7 @@
 using Microsoft.FancyZones.UnitTests.Utils;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTests_FancyZones_WinAppDriver
+namespace UITests_FancyZones
 {
     [TestClass]
     public class RunFancyZonesTest
diff --git a/src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/UnitTests-FancyZones-WinAppDriver.csproj b/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj
similarity index 89%
rename from src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/UnitTests-FancyZones-WinAppDriver.csproj
rename to src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj
index 89e2289a3e..b6c3fda58f 100644
--- a/src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/UnitTests-FancyZones-WinAppDriver.csproj
+++ b/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj
@@ -6,7 +6,7 @@
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <ProjectGuid>{FE38FC07-1C05-4B57-ADA3-2FE2F53C6A52}</ProjectGuid>
-    <RootNamespace>Microsoft.FancyZones.UnitTests</RootNamespace>
+    <RootNamespace>Microsoft.FancyZones.UITests</RootNamespace>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
     <OutputType>Library</OutputType>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\UnitTest-FancyZones-WinAppDriver\</OutputPath>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\UITests-FancyZones\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/Utils/FancyZonesSession.cs b/src/modules/fancyzones/UITests-FancyZones/Utils/FancyZonesSession.cs
similarity index 100%
rename from src/modules/fancyzones/UnitTests-FancyZones-WinAppDriver/Utils/FancyZonesSession.cs
rename to src/modules/fancyzones/UITests-FancyZones/Utils/FancyZonesSession.cs