diff --git a/.pipelines/v2/templates/job-test-project.yml b/.pipelines/v2/templates/job-test-project.yml
index 81efc062dc..4695684b89 100644
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -107,7 +107,7 @@ jobs:
       rerunFailedTests: true
       ${{ if eq(parameters.isUIAutomationPipeline, true) }}:
         testAssemblyVer2: |
-          **\*UITest*.dll
+          **\UITests-FancyZones.dll
           !**\obj\**
           !**\ref\**
       ${{ else }}:
diff --git a/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs b/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs
index 2a97690b43..8648e3a389 100644
--- a/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs
@@ -555,6 +555,13 @@ namespace Microsoft.FancyZones.UITests
 
         private void OpenFancyZonesPanel(bool launchAsAdmin = false)
         {
+            if (this.Session.IsWindowOpen("FancyZones Layout"))
+            {
+                AttachFancyZonesEditor();
+                CloseFancyZonesEditor();
+                AttachPowertoySetting();
+            }
+
             var windowingElement = this.Find<NavigationViewItem>("Windowing & Layouts");
 
             // Goto FancyZones Editor setting page