diff --git a/src/common/UITestAutomation/Doc/ui-automation-cover-list.md b/src/common/UITestAutomation/Doc/ui-automation-cover-list.md
index 9852919b2a..326adb686e 100644
--- a/src/common/UITestAutomation/Doc/ui-automation-cover-list.md
+++ b/src/common/UITestAutomation/Doc/ui-automation-cover-list.md
@@ -98,23 +98,79 @@
 
 ## [FancyZones Editor](tests-checklist-template-fancyzones-section.md)
 
-- [ ] 1. Open editor from the settings
+- [x] 1. Open editor from the settings
+      - TestMethod("FancyZones.Setting")
 - [ ] 2. Open editor with a shortcut
-- [ ] 3. Create a new layout (grid and canvas)
-- [ ] 4. Duplicate a template and a custom layout
-- [ ] 5. Delete layout
-- [ ] 6. Edit templates (number of zones, spacing, distance to highlight adjacent zones). Verify after reopening the editor that saved settings are kept the same.
-- [ ] 7. Edit canvas layout: zones size and position, create or delete zones.
-- [ ] 8. Edit grid layout: split, merge, resize zones.
-- [ ] 9. Check `Save and apply` and `Cancel` buttons behavior after editing.
-- [ ] 10. Assign a layout to each monitor.
-- [ ] 11. Assign keys to quickly switch layouts (custom layouts only), `Win + Ctrl + Alt + number`.
-- [ ] 12. Assign horizontal and vertical default layouts
-- [ ] 13. Test duplicate layout focus
+- [x] 3. Create a new layout (grid and canvas)
+      - TestMethod("FancyZonesEditor.Basic.CreateWithCustomName")
+      - TestMethod("FancyZonesEditor.Basic.CreateGrid")
+      - TestMethod("FancyZonesEditor.Basic.CreateCanvas")
+      - TestMethod("FancyZonesEditor.Basic.CancelGridCreation")
+      - TestMethod("FancyZonesEditor.Basic.CancelCanvasCreation")
+- [x] 4. Duplicate a template and a custom layout
+      - TestMethod("FancyZonesEditor.Basic.CopyTemplate_FromEditLayoutWindow")
+      - TestMethod("FancyZonesEditor.Basic.CopyTemplate_FromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_FromEditLayoutWindow")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_FromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_Hotkey")
+- [x] 5. Delete layout
+      - TestMethod("FancyZonesEditor.Basic.DeleteNotAppliedLayout")
+      - TestMethod("FancyZonesEditor.Basic.DeleteAppliedLayout")
+      - TestMethod("FancyZonesEditor.Basic.CancelDeletion")
+      - TestMethod("FancyZonesEditor.Basic.DeleteFromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.DeleteDefaultLayout")
+      - TestMethod("FancyZonesEditor.Basic.DeleteLayoutWithHotkey")
+- [x] 6. Edit templates (number of zones, spacing, distance to highlight adjacent zones). Verify after reopening the editor that saved settings are kept the same.
+      - TestMethod("FancyZonesEditor.Basic.ZoneNumber_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.HighlightDistance_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.HighlightDistance_Save")
+      - TestMethod("FancyZonesEditor.Basic.HighlightDistance_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Slider_Save")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Slider_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Toggle_Save")
+      - TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Toggle_Cancel")
+- [x] 7. Edit canvas layout: zones size and position, create or delete zones.
+      - TestMethod("FancyZonesEditor.Basic.OpenEditMode")
+      - TestMethod("FancyZonesEditor.Basic.OpenEditModeFromContextMenu")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_AddZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_AddZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_DeleteZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_DeleteZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_MoveZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_MoveZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_ResizeZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Canvas_ResizeZone_Cancel")
+- [x] 8. Edit grid layout: split, merge, resize zones.
+      - TestMethod("FancyZonesEditor.Basic.Grid_SplitZone_Save")
+      - TestMethod("FancyZonesEditor.Basic.Grid_SplitZone_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MergeZones_Save")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MergeZones_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MoveSplitter_Save")
+      - TestMethod("FancyZonesEditor.Basic.Grid_MoveSplitter_Cancel")
+- [x] 9. Check `Save and apply` and `Cancel` buttons behavior after editing.
+      - All Save and Cancel button have this test.
+- [x] 10. Assign a layout to each monitor.
+      - TestMethod("FancyZonesEditor.Basic.ApplyLayoutsOnEachMonitor")
+      - TestMethod("FancyZonesEditor.Basic.ApplyTemplateWithDifferentParametersOnEachMonitor")
+- [x] 11. Assign keys to quickly switch layouts (custom layouts only), `Win + Ctrl + Alt + number`.
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Assign_Save")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Assign_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Assign_AllPossibleValues")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Reset_Save")
+      - TestMethod("FancyZonesEditor.Basic.HotKey_Reset_Cancel")
+- [x] 12. Assign horizontal and vertical default layouts
+      - TestMethod("FancyZonesEditor.Basic.Default_Initialize")
+      - TestMethod("FancyZonesEditor.Basic.Default_Assign_Cancel")
+      - TestMethod("FancyZonesEditor.Basic.Default_Assign_Save")
+- [x] 13. Test duplicate layout focus
    * Select any layout X in 'Templates' or 'Custom' section by click left mouse button
    * Mouse right button click on any layout Y in 'Templates' or 'Custom' sections
    * Duplicate it by clicking 'Create custom layout' (Templates section) or 'Duplicate' in 'Custom' section
    * Expect the layout Y is duplicated
+      - TestMethod("FancyZonesEditor.Basic.CopyTemplate_DefaultLayout")
+      - TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_DefaultLayout")
 
 ## [FancyZones](tests-checklist-template-fancyzones-section.md)
 
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/ApplyLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/ApplyLayoutTests.cs
index 9b71dfaf24..c4f058533f 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/ApplyLayoutTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/ApplyLayoutTests.cs
@@ -229,7 +229,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(Parameters.Monitors[0].MonitorNumber, data.AppliedLayouts[0].Device.MonitorNumber);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.ApplyLayoutsOnEachMonitor")]
+        [TestCategory("FancyZones Editor #10")]
         public void ApplyLayoutsOnEachMonitor()
         {
             // apply the layout on the first monitor
@@ -256,7 +257,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(secondLayout.Uuid, data.AppliedLayouts.Find(x => x.Device.MonitorNumber == 2).AppliedLayout.Uuid);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.ApplyTemplateWithDifferentParametersOnEachMonitor")]
+        [TestCategory("FancyZones Editor #10")]
         public void ApplyTemplateWithDifferentParametersOnEachMonitor()
         {
             var layoutType = LayoutType.Columns;
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs
index b00b6d0de7..6ff9eb4895 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/CopyLayoutTests.cs
@@ -173,7 +173,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             this.RestartScopeExe();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CopyTemplate_FromEditLayoutWindow")]
+        [TestCategory("FancyZones Editor #4")]
         public void CopyTemplate_FromEditLayoutWindow()
         {
             string copiedLayoutName = TestConstants.TemplateLayoutNames[LayoutType.Focus] + " (1)";
@@ -190,7 +191,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == copiedLayoutName));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CopyTemplate_FromEditLayoutWindow")]
+        [TestCategory("FancyZones Editor #4")]
         public void CopyTemplate_FromContextMenu()
         {
             string copiedLayoutName = TestConstants.TemplateLayoutNames[LayoutType.Rows] + " (1)";
@@ -206,7 +208,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == copiedLayoutName));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CopyTemplate_DefaultLayout")]
+        [TestCategory("FancyZones Editor #13")]
         public void CopyTemplate_DefaultLayout()
         {
             string copiedLayoutName = TestConstants.TemplateLayoutNames[LayoutType.PriorityGrid] + " (1)";
@@ -238,7 +241,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(defaultLayouts.Serialize(DefaultLayouts), defaultLayouts.Serialize(defaultLayoutData));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_FromEditLayoutWindow")]
+        [TestCategory("FancyZones Editor #4")]
         public void CopyCustomLayout_FromEditLayoutWindow()
         {
             string copiedLayoutName = CustomLayouts.CustomLayouts[0].Name + " (1)";
@@ -255,7 +259,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == copiedLayoutName));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_FromContextMenu")]
+        [TestCategory("FancyZones Editor #4")]
         public void CopyCustomLayout_FromContextMenu()
         {
             string copiedLayoutName = CustomLayouts.CustomLayouts[0].Name + " (1)";
@@ -271,7 +276,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == copiedLayoutName));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_DefaultLayout")]
+        [TestCategory("FancyZones Editor #13")]
         public void CopyCustomLayout_DefaultLayout()
         {
             string copiedLayoutName = CustomLayouts.CustomLayouts[0].Name + " (1)";
@@ -303,7 +309,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(defaultLayouts.Serialize(DefaultLayouts), defaultLayouts.Serialize(defaultLayoutData));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CopyCustomLayout_Hotkey")]
+        [TestCategory("FancyZones Editor #4")]
         public void CopyCustomLayout_Hotkey()
         {
             string copiedLayoutName = CustomLayouts.CustomLayouts[0].Name + " (1)";
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/CreateLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/CreateLayoutTests.cs
index e3569df13a..a6e1adfb82 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/CreateLayoutTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/CreateLayoutTests.cs
@@ -152,7 +152,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == name));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CreateWithCustomName")]
+        [TestCategory("FancyZones Editor #3")]
         public void CreateWithCustomName()
         {
             string name = "Layout Name";
@@ -173,7 +174,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == name));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CreateGrid")]
+        [TestCategory("FancyZones Editor #3")]
         public void CreateGrid()
         {
             CustomLayout type = CustomLayout.Grid;
@@ -189,7 +191,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Type == type.TypeToString()));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CreateCanvas")]
+        [TestCategory("FancyZones Editor #3")]
         public void CreateCanvas()
         {
             CustomLayout type = CustomLayout.Canvas;
@@ -205,7 +208,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Type == type.TypeToString()));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CancelGridCreation")]
+        [TestCategory("FancyZones Editor #3")]
         public void CancelGridCreation()
         {
             Session.Find<Element>(By.AccessibilityId(AccessibilityId.NewLayoutButton)).Click();
@@ -219,7 +223,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(0, data.CustomLayouts.Count);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CancelCanvasCreation")]
+        [TestCategory("FancyZones Editor #3")]
         public void CancelCanvasCreation()
         {
             Session.Find<Element>(By.AccessibilityId(AccessibilityId.NewLayoutButton)).Click();
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs
index fa2601b448..8cf285b022 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/DefaultLayoutsTest.cs
@@ -238,14 +238,16 @@ namespace Microsoft.FancyZonesEditor.UITests
             this.RestartScopeExe();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Default_Initialize")]
+        [TestCategory("FancyZones Editor #12")]
         public void Initialize()
         {
             CheckTemplateLayouts(LayoutType.Grid, null);
             CheckCustomLayouts(string.Empty, CustomLayouts.CustomLayouts[0].Uuid);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Default_Assign_Cancel")]
+        [TestCategory("FancyZones Editor #12")]
         public void Assign_Cancel()
         {
             // assign Focus as a default horizontal and vertical layout
@@ -261,7 +263,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             CheckCustomLayouts(string.Empty, CustomLayouts.CustomLayouts[0].Uuid);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Default_Assign_Save")]
+        [TestCategory("FancyZones Editor #12")]
         public void Assign_Save()
         {
             // assign Focus as a default horizontal and vertical layout
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs
index 02ec3ad8cd..a8616e9a42 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/DeleteLayoutTests.cs
@@ -216,7 +216,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Session.Find<Element>(CustomLayouts.CustomLayouts[0].Name).Click();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.DeleteNotAppliedLayout")]
+        [TestCategory("FancyZones Editor #5")]
         public void DeleteNotAppliedLayout()
         {
             var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
@@ -234,7 +235,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsFalse(data.CustomLayouts.Exists(x => x.Name == deletedLayout));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.DeleteAppliedLayout")]
+        [TestCategory("FancyZones Editor #5")]
         public void DeleteAppliedLayout()
         {
             var deletedLayout = CustomLayouts.CustomLayouts[0].Name;
@@ -260,7 +262,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(LayoutType.Blank.TypeToString(), appliedLayoutsData.AppliedLayouts.Find(x => x.Device.Monitor == Parameters.Monitors[0].Monitor).AppliedLayout.Type);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.CancelDeletion")]
+        [TestCategory("FancyZones Editor #5")]
         public void CancelDeletion()
         {
             var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
@@ -278,7 +281,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(data.CustomLayouts.Exists(x => x.Name == deletedLayout));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.DeleteFromContextMenu")]
+        [TestCategory("FancyZones Editor #5")]
         public void DeleteFromContextMenu()
         {
             var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
@@ -295,7 +299,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsFalse(data.CustomLayouts.Exists(x => x.Name == deletedLayout));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.DeleteDefaultLayout")]
+        [TestCategory("FancyZones Editor #5")]
         public void DeleteDefaultLayout()
         {
             var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
@@ -314,7 +319,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(LayoutType.PriorityGrid.TypeToString(), data.DefaultLayouts.Find(x => x.MonitorConfiguration == configuration).Layout.Type);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.DeleteLayoutWithHotkey")]
+        [TestCategory("FancyZones Editor #5")]
         public void DeleteLayoutWithHotkey()
         {
             var deletedLayout = CustomLayouts.CustomLayouts[1].Name;
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs
index f88aad1baf..930e0ac320 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/EditLayoutTests.cs
@@ -210,7 +210,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             this.RestartScopeExe();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.OpenEditMode")]
+        [TestCategory("FancyZones Editor #7")]
         public void OpenEditMode()
         {
             Session.Find<Element>(Layouts.CustomLayouts[0].Name).Find<Button>(By.AccessibilityId(AccessibilityId.EditLayoutButton)).Click();
@@ -219,7 +220,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Session.Find<Button>(ElementName.Cancel).Click();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.OpenEditModeFromContextMenu")]
+        [TestCategory("FancyZones Editor #7")]
         public void OpenEditModeFromContextMenu()
         {
             FancyZonesEditorHelper.ClickContextMenuItem(Session, Layouts.CustomLayouts[0].Name, FancyZonesEditorHelper.ElementName.EditZones);
@@ -227,7 +229,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Session.Find<Button>(ElementName.Cancel).Click();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_AddZone_Save")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_AddZone_Save()
         {
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
@@ -243,7 +246,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected.Zones.Count + 1, actual.Zones.Count);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_AddZone_Cancel")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_AddZone_Cancel()
         {
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
@@ -259,7 +263,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected.Zones.Count, actual.Zones.Count);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_DeleteZone_Save")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_DeleteZone_Save()
         {
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
@@ -275,7 +280,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected.Zones.Count - 1, actual.Zones.Count);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_DeleteZone_Cancel")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_DeleteZone_Cancel()
         {
             var canvas = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Canvas.TypeToString());
@@ -291,7 +297,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected.Zones.Count, actual.Zones.Count);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_MoveZone_Save")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_MoveZone_Save()
         {
             int zoneNumber = 1;
@@ -328,7 +335,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_MoveZone_Cancel")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_MoveZone_Cancel()
         {
             int zoneNumber = 1;
@@ -352,7 +360,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_ResizeZone_Save")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_ResizeZone_Save()
         {
             int zoneNumber = 1;
@@ -389,7 +398,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Canvas_ResizeZone_Cancel")]
+        [TestCategory("FancyZones Editor #7")]
         public void Canvas_ResizeZone_Cancel()
         {
             int zoneNumber = 1;
@@ -416,7 +426,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Grid_SplitZone_Save")]
+        [TestCategory("FancyZones Editor #8")]
         public void Grid_SplitZone_Save()
         {
             int zoneNumber = 1;
@@ -445,7 +456,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Grid_SplitZone_Cancel")]
+        [TestCategory("FancyZones Editor #8")]
         public void Grid_SplitZone_Cancel()
         {
             int zoneNumber = 1;
@@ -476,7 +488,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Grid_MergeZones_Save")]
+        [TestCategory("FancyZones Editor #8")]
         public void Grid_MergeZones_Save()
         {
             var grid = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Grid.TypeToString());
@@ -510,7 +523,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.IsTrue(actual.CellChildMap[1].SequenceEqual([1, 2]));
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Grid_MergeZones_Cancel")]
+        [TestCategory("FancyZones Editor #8")]
         public void Grid_MergeZones_Cancel()
         {
             var grid = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Grid.TypeToString());
@@ -546,7 +560,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Grid_MoveSplitter_Save")]
+        [TestCategory("FancyZones Editor #8")]
         public void Grid_MoveSplitter_Save()
         {
             EditorParameters editorParameters = new EditorParameters();
@@ -609,7 +624,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.Grid_MoveSplitter_Cancel")]
+        [TestCategory("FancyZones Editor #8")]
         public void Grid_MoveSplitter_Cancel()
         {
             var grid = Layouts.CustomLayouts.Find(x => x.Type == CustomLayout.Grid.TypeToString() && x.Name == "Grid-9");
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs
index 1359ab610c..145a578bb9 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/LayoutHotkeysTests.cs
@@ -207,7 +207,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             this.RestartScopeExe();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HotKey_Initialize")]
+        [TestCategory("FancyZones Editor #11")]
         public void Initialize()
         {
             foreach (var layout in CustomLayouts.CustomLayouts)
@@ -251,7 +252,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HotKey_Assign_Save")]
+        [TestCategory("FancyZones Editor #11")]
         public void Assign_Save()
         {
             var layout = CustomLayouts.CustomLayouts[2]; // a layout without assigned hotkey
@@ -294,7 +296,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HotKey_Assign_Cancel")]
+        [TestCategory("FancyZones Editor #11")]
         public void Assign_Cancel()
         {
             var layout = CustomLayouts.CustomLayouts[2]; // a layout without assigned hotkey
@@ -333,7 +336,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HotKey_Assign_AllPossibleValues")]
+        [TestCategory("FancyZones Editor #11")]
         public void Assign_AllPossibleValues()
         {
             for (int i = 0; i < 4; i++)
@@ -379,7 +383,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HotKey_Reset_Save")]
+        [TestCategory("FancyZones Editor #11")]
         public void Reset_Save()
         {
             var layout = CustomLayouts.CustomLayouts[0]; // a layout with assigned hotkey
@@ -419,7 +424,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HotKey_Reset_Cancel")]
+        [TestCategory("FancyZones Editor #11")]
         public void Reset_Cancel()
         {
             var layout = CustomLayouts.CustomLayouts[0]; // a layout with assigned hotkey
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs
index a98063ab9c..7923b1f676 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/TemplateLayoutsTests.cs
@@ -192,7 +192,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             this.RestartScopeExe();
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.ZoneNumber_Cancel")]
+        [TestCategory("FancyZones Editor #6")]
         public void ZoneNumber_Cancel()
         {
             var type = LayoutType.Rows;
@@ -213,7 +214,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected, actual);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HighlightDistance_Initialize")]
+        [TestCategory("FancyZones Editor #6")]
         public void HighlightDistance_Initialize()
         {
             foreach (var (type, name) in TestConstants.TemplateLayoutNames)
@@ -234,7 +236,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HighlightDistance_Save")]
+        [TestCategory("FancyZones Editor #6")]
         public void HighlightDistance_Save()
         {
             var type = LayoutType.Focus;
@@ -258,7 +261,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected, actual);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.HighlightDistance_Cancel")]
+        [TestCategory("FancyZones Editor #6")]
         public void HighlightDistance_Cancel()
         {
             var type = LayoutType.Focus;
@@ -278,7 +282,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected, actual);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Initialize")]
+        [TestCategory("FancyZones Editor #6")]
         public void SpaceAroundZones_Initialize()
         {
             foreach (var (type, name) in TestConstants.TemplateLayoutNames)
@@ -304,7 +309,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             }
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Slider_Save")]
+        [TestCategory("FancyZones Editor #6")]
         public void SpaceAroundZones_Slider_Save()
         {
             var type = LayoutType.PriorityGrid;
@@ -326,7 +332,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected, actual);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Slider_Cancel")]
+        [TestCategory("FancyZones Editor #6")]
         public void SpaceAroundZones_Slider_Cancel()
         {
             var type = LayoutType.PriorityGrid;
@@ -348,7 +355,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected, actual);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Toggle_Save")]
+        [TestCategory("FancyZones Editor #6")]
         public void SpaceAroundZones_Toggle_Save()
         {
             var type = LayoutType.PriorityGrid;
@@ -371,7 +379,8 @@ namespace Microsoft.FancyZonesEditor.UITests
             Assert.AreEqual(expected, actual);
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.SpaceAroundZones_Toggle_Cancel")]
+        [TestCategory("FancyZones Editor #6")]
         public void SpaceAroundZones_Toggle_Cancel()
         {
             var type = LayoutType.PriorityGrid;
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs
index 621c6886a6..7c9e47f0d3 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/UIInitializeTest.cs
@@ -27,7 +27,8 @@ namespace Microsoft.FancyZonesEditor.UITests
         {
         }
 
-        [TestMethod]
+        [TestMethod("FancyZonesEditor.Basic.EditorParams_VerifySelectedMonitor")]
+        [TestCategory("FancyZones Editor #10")]
         public void EditorParams_VerifySelectedMonitor()
         {
             InitFileData();