diff --git a/src/common/UITestAutomation/Doc/ui-automation-cover-list.md b/src/common/UITestAutomation/Doc/ui-automation-cover-list.md
index 326adb686e..dfeeaf0bcf 100644
--- a/src/common/UITestAutomation/Doc/ui-automation-cover-list.md
+++ b/src/common/UITestAutomation/Doc/ui-automation-cover-list.md
@@ -282,15 +282,24 @@ Select Move windows based on `Relative position`.
 
 ### Layout apply
 Enable `Enable quick layout switch`, assign numbers to custom layouts.
-- [ ] 1. Switch with `Win` + `Ctrl` + `Alt` + `key`.
-- [ ] 2. Switch with just a key while dragging a window.
-- [ ] 3. Turn `Flash zones when switching layout` on/off, verify it's flashing/not flashing after pressing the shortcut.
-- [ ] 4. Disable `Enable quick layout switch`, verify shortcuts don't work.
-- [ ] 5. Disable spacing on any grid layout, verify that there is no space between zones while dragging a window.
-- [ ] 6. Create a new virtual desktop, verify that there are the same layouts as applied to the previous virtual desktop.
-- [ ] 7. After creating a virtual desktop apply another layout or edit the applied one. Verify that the other virtual desktop layout wasn't changed.
-- [ ] 8. Delete an applied custom layout in the Editor, verify that there is no layout applied instead of it.
-- [ ] 9. Apply a grid layout, change the screen resolution or scaling, verify that the assigned layout fits the screen. NOTE: canvas layout could not fit the screen if it was created on a monitor with a different resolution.
+- [x] 1. Switch with `Win` + `Ctrl` + `Alt` + `key`.
+      - TestMethod("FancyZones.Settings.TestApplyHotKey")
+- [x] 2. Switch with just a key while dragging a window.
+      - TestMethod("FancyZones.Settings.TestDragShiftHotKey")
+- [x] 3. Turn `Flash zones when switching layout` on/off, verify it's flashing/not flashing after pressing the shortcut.
+      - TestMethod("FancyZones.Settings.HotKeyWindowFlashTest")
+- [x] 4. Disable `Enable quick layout switch`, verify shortcuts don't work.
+      - TestMethod("FancyZones.Settings.TestDisableApplyHotKey")
+- [x] 5. Disable spacing on any grid layout, verify that there is no space between zones while dragging a window.
+      - This feature is not available in the current release version.
+- [x] 6. Create a new virtual desktop, verify that there are the same layouts as applied to the previous virtual desktop.
+      - TestMethod("FancyZones.Settings.TestVirtualDesktopLayout")
+- [x] 7. After creating a virtual desktop apply another layout or edit the applied one. Verify that the other virtual desktop layout wasn't changed.
+      - TestMethod("FancyZones.Settings.TestVirtualDesktopLayoutExt")
+- [x] 8. Delete an applied custom layout in the Editor, verify that there is no layout applied instead of it.
+      - TestMethod("FancyZones.Settings.TestDeleteCustomLayoutBehavior")
+- [x] 9. Apply a grid layout, change the screen resolution or scaling, verify that the assigned layout fits the screen. NOTE: canvas layout could not fit the screen if it was created on a monitor with a different resolution.
+      - TestMethod("FancyZones.Settings.TestCreateGridLayoutChangeMonitorSetting")
 
 ### Layout reset
 * Test layout resetting.
diff --git a/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs b/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs
index 6de6d851c6..78d45def20 100644
--- a/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZones/LayoutApplyHotKeyTests.cs
@@ -276,7 +276,8 @@ namespace Microsoft.FancyZones.UITests
             this.RestartScopeExe();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.TestApplyHotKey")]
+        [TestCategory("FancyZones #1")]
         public void TestApplyHotKey()
         {
             this.OpenFancyZonesPanel();
@@ -304,7 +305,8 @@ namespace Microsoft.FancyZones.UITests
             this.AttachPowertoySetting();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.TestDragShiftHotKey")]
+        [TestCategory("FancyZones #2")]
         public void TestDragShiftHotKey()
         {
             this.OpenFancyZonesPanel();
@@ -369,7 +371,8 @@ namespace Microsoft.FancyZones.UITests
             Session.KillAllProcessesByName("explorer");
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.HotKeyWindowFlashTest")]
+        [TestCategory("FancyZones #3")]
         public void HotKeyWindowFlashTest()
         {
             this.OpenFancyZonesPanel();
@@ -402,7 +405,8 @@ namespace Microsoft.FancyZones.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.TestDisableApplyHotKey")]
+        [TestCategory("FancyZones #4")]
         public void TestDisableApplyHotKey()
         {
             this.OpenFancyZonesPanel();
@@ -430,7 +434,8 @@ namespace Microsoft.FancyZones.UITests
             this.AttachPowertoySetting();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.TestVirtualDesktopLayout")]
+        [TestCategory("FancyZones #6")]
         public void TestVirtualDesktopLayout()
         {
             this.OpenFancyZonesPanel();
@@ -457,7 +462,8 @@ namespace Microsoft.FancyZones.UITests
             Task.Delay(500).Wait(); // Optional: Wait for a moment to ensure window switch
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.TestVirtualDesktopLayoutExt")]
+        [TestCategory("FancyZones #7")]
         public void TestVirtualDesktopLayoutExt()
         {
             this.OpenFancyZonesPanel();
@@ -494,7 +500,8 @@ namespace Microsoft.FancyZones.UITests
             Task.Delay(500).Wait(); // Optional: Wait for a moment to ensure window switch
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.TestDeleteCustomLayoutBehavior")]
+        [TestCategory("FancyZones #8")]
         public void TestDeleteCustomLayoutBehavior()
         {
             this.OpenFancyZonesPanel();
@@ -509,7 +516,8 @@ namespace Microsoft.FancyZones.UITests
             Assert.IsTrue(Session.Find<Element>(TestConstants.TemplateLayoutNames[LayoutType.Blank])!.Selected);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZones.Settings.TestCreateGridLayoutChangeMonitorSetting")]
+        [TestCategory("FancyZones #9")]
         public void TestCreateGridLayoutChangeMonitorSetting()
         {
             this.OpenFancyZonesPanel();