diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue11501.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue11501.cs
index 07a97eac7461..8948a6aa746e 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue11501.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue11501.cs
@@ -13,10 +13,10 @@ public Issue11501(TestDevice device) : base(device)
 
 		public override string Issue => "Making Fragment Changes While App is Backgrounded Fails";
 
-		[TestCase("SwapMainPage")]
-		[TestCase("SwapFlyoutPage")]
-		[TestCase("SwapTabbedPage")]
-		[TestCase("RemoveAddTabs")]
+		[TestCase("SwapMainPage", Category = UITestCategories.Navigation)]
+		[TestCase("SwapFlyoutPage", Category = UITestCategories.FlyoutPage)]
+		[TestCase("SwapTabbedPage", Category = UITestCategories.TabbedPage)]
+		[TestCase("RemoveAddTabs", Category = UITestCategories.TabbedPage)]
 		public void MakingFragmentRelatedChangesWhileAppIsBackgroundedFails(string scenario)
 		{
 			try
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21630.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21630.cs
index 31a2574458be..f6506e652eb6 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21630.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21630.cs
@@ -18,8 +18,9 @@ public Issue21630(TestDevice device)
     string FocusButton => "FocusButton";
     string RestoreButton => "RestoreMainPageButton";
 
-	[TestCase("SwapNavigationPage")]
-	[TestCase("SwapShellPage")]
+	[TestCase("SwapNavigationPage", Category = UITestCategories.Entry)]
+	[TestCase("SwapShellPage", Category = UITestCategories.Entry)]
+
 	public void NavBarEntryDoesNotTriggerKeyboardScroll(string scenario)
 	{
 		try