diff --git a/eng/pipelines/common/ui-tests.yml b/eng/pipelines/common/ui-tests.yml
index 3e1c44d6ac06..07658053ab0c 100644
--- a/eng/pipelines/common/ui-tests.yml
+++ b/eng/pipelines/common/ui-tests.yml
@@ -17,23 +17,27 @@ parameters:
     # we might want to improve this somehow depending on how much the categories change over time
     - 'Accessibility,ActionSheet,ActivityIndicator,Animation,AppLinks'
     - 'Border,BoxView,Brush,Button'
-    - 'Cells,CheckBox,ContextActions,CustomRenderers'
     - 'CarouselView'
+    - 'Cells,CheckBox,ContextActions,CustomRenderers,DatePicker,Dispatcher,DisplayAlert,DisplayPrompt,DragAndDrop'
     - 'CollectionView'
-    - 'DatePicker,Dispatcher,DisplayAlert,DisplayPrompt,DragAndDrop'
     - 'Entry'
     - 'Editor,Effects,FlyoutPage,Focus,Fonts,Frame,Gestures,GraphicsView'
     - 'Image,ImageButton,IndicatorView,InputTransparent,IsEnabled,IsVisible'
-    - 'Label,Layout,Lifecycle,ListView'
-    - 'ManualReview,Maps'
+    - 'Label'
+    - 'Layout'
+    - 'Lifecycle,ManualReview,Maps'
+    - 'ListView'
     - 'Navigation'
     - 'Page,Performance,Picker,ProgressBar'
     - 'RadioButton,RefreshView'
-    - 'SafeAreaEdges'
-    - 'ScrollView,SearchBar,Shape,Slider,SoftInput,Stepper,Switch,SwipeView'
+    - 'SafeAreaEdges,Shadow'
+    - 'ScrollView'
+    - 'SearchBar,Shape,Slider'
+    - 'SoftInput,Stepper,Switch,SwipeView'
     - 'Shell'
     - 'TabbedPage,TableView,TimePicker,TitleView,ToolbarItem'
-    - 'Shadow,ViewBaseTests,Visual,WebView,Window'
+    - 'ViewBaseTests,Window'
+    - 'WebView'
 
   projects:
     - name: name
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17884.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17884.cs
index 206a718371f7..5c28c60c0f24 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17884.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17884.cs
@@ -13,7 +13,7 @@ public Issue17884(TestDevice device)
 		public override string Issue => "[Android] Entire words omitted & letters truncated from Label display";
 
 		[Test]
-		[Category(UITestCategories.Visual)]
+		[Category(UITestCategories.Label)]
 		public void VerifyTextIsNotMissing()
 		{
 			App.WaitForElement("StubLabel");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs
index f5f771751be5..51cbcee55226 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24414.cs
@@ -13,7 +13,7 @@ public Issue24414(TestDevice device)
 		public override string Issue => "Shadows not rendering as expected on Android and iOS";
 
 		[Test]
-		[Category(UITestCategories.Visual)]
+		[Category(UITestCategories.Shadow)]
 		public void Issue24414Test()
 		{
 			App.WaitForElement("TheLabel");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24847.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24847.cs
index dc61893104a7..1e964cb86b35 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24847.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24847.cs
@@ -13,7 +13,7 @@ public Issue24847(TestDevice testDevice) : base(testDevice)
 		public override string Issue => "[iOS] Background layer frame mapping has poor performance";
 
 		[Test]
-		[Category(UITestCategories.Visual)]
+		[Category(UITestCategories.Brush)]
 		public void BackgroundFrameResizesFastAndCorrectly()
 		{
 			App.WaitForElement("ChangeSizeBtn");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27730.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27730.cs
index 0618bdabe677..faa5b1ee71f2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27730.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27730.cs
@@ -13,7 +13,7 @@ public Issue27730(TestDevice testDevice) : base(testDevice)
 		public override string Issue => "Shadow not updated when Clipping a View with a shadow";
 
 		[Test]
-		[Category(UITestCategories.Visual)]
+		[Category(UITestCategories.Shadow)]
 		public void ShadowShouldUpdateWhenClipping()
 		{
 			App.WaitForElement("ApplyShadowBtn");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27732.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27732.cs
index 7f8e6a59d9a6..87fc7a819c19 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27732.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27732.cs
@@ -15,7 +15,7 @@ public Issue27732(TestDevice testDevice) : base(testDevice)
 	const string ToggleShadowButton = "ToggleShadowButton";
 
 	[Test]
-	[Category(UITestCategories.Visual)]
+	[Category(UITestCategories.Shadow)]
 	public void ViewShouldNotShiftOnShadowChanged()
 	{
 		App.WaitForElement(ToggleShadowButton);
diff --git a/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs b/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs
index 476b5977f38a..24ad345f9773 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs
@@ -56,7 +56,7 @@ internal static class UITestCategories
 		public const string Focus = "Focus";
 		public const string ManualReview = "ManualReview";
 		public const string Performance = "Performance";
-		public const string Visual = "Visual";
+
 		public const string AppLinks = "AppLinks";
 		public const string Shell = "Shell";
 		public const string TabbedPage = "TabbedPage";