diff --git a/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs b/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
index fd179a9a7f10..aee1b1dbd1c5 100644
--- a/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
+++ b/src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
@@ -193,6 +193,25 @@ public Task<bool> NavigateToGalleryPage(string pageTitle)
 			return Task.FromResult(false);
 		}
 
+		/// <summary>
+		/// Attempts to retrieve a gallery page by title.
+		/// </summary>
+		/// <param name="pageTitle">The title of the gallery page to find.</param>
+		/// <returns>The Page instance if found; otherwise, null.</returns>
+		/// <remarks>
+		/// This method searches for a matching gallery page by title (case-insensitive).
+		/// If a match is found, it invokes the associated Realize factory to create the page.
+		/// </remarks>
+		public Page TryToGetGalleryPage(string pageTitle)
+		{
+			if (_titleToPage.TryGetValue(pageTitle.ToLowerInvariant(), out GalleryPageFactory pageFactory))
+			{
+				return pageFactory.Realize();
+			}
+
+			return null;
+		}
+
 		public async Task<bool> NavigateToTest(string pageTitle)
 		{
 			var testCaseScreen = new TestCases.TestCaseScreen();
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53179.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53179.cs
index 72cf90036024..7492c94d8de3 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53179.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53179.cs
@@ -22,7 +22,7 @@ class TestPage : ContentPage
 
 				public TestPage(int index)
 				{
-					nextBtn = new Button { AutomationId = "Next Page", Text = "Next Page" };
+					nextBtn = new Button { AutomationId = $"Next Page {index}", Text = $"Next Page {index}" };
 					rmBtn = new Button { AutomationId = "Remove previous pages", Text = "Remove previous pages" };
 					popBtn = new Button { AutomationId = "Back", Text = "Back" };
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53834.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53834.cs
index bd1bc6b42b4c..5519e0828f68 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53834.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla53834.cs
@@ -44,6 +44,7 @@ protected override void Init()
 			lstView = new ListView()
 			{
 				IsGroupingEnabled = true,
+				VerticalScrollBarVisibility = ScrollBarVisibility.Never,
 				HasUnevenRows = true,
 				ItemTemplate = new DataTemplate(typeof(MyViewCell)),
 				GroupHeaderTemplate = new DataTemplate(typeof(MyHeaderViewCell)),
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/CollectionViewVisibility.cs b/src/Controls/tests/TestCases.HostApp/Issues/CollectionViewVisibility.cs
deleted file mode 100644
index 9a064a8fd411..000000000000
--- a/src/Controls/tests/TestCases.HostApp/Issues/CollectionViewVisibility.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace Maui.Controls.Sample.Issues
-{
-	// InitiallyInvisbleCollectionViewSurvivesiOSLayoutNonsense(src\Compatibility\ControlGallery\src\Issues.Shared\Issue12714.cs)
-	[Issue(IssueTracker.None, 12714, "iOS application suspended at UICollectionViewFlowLayout.PrepareLayout() when using IsVisible = false", PlatformAffected.iOS)]
-	public class CollectionViewVisibility : ContentPage
-	{
-		const string Success = "Success";
-		const string Show = "Show";
-
-		public CollectionViewVisibility()
-		{
-			var items = new List<string>() { "uno", "dos", "tres", Success };
-			var cv = new CollectionView
-			{
-				ItemsSource = items,
-				IsVisible = false,
-				ItemsLayout = new GridItemsLayout(2, ItemsLayoutOrientation.Vertical)
-			};
-
-			var layout = new StackLayout() { Margin = 40 };
-
-			var button = new Button { AutomationId = Show, Text = Show };
-			button.Clicked += (sender, args) => { cv.IsVisible = !cv.IsVisible; };
-
-			layout.Children.Add(button);
-			layout.Children.Add(cv);
-
-			Content = layout;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml.cs
index bfe8c771cb5b..b4b49cb67164 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml.cs
@@ -13,6 +13,9 @@ async void Issue18161_Loaded(object sender, EventArgs e)
 		{
 			// https://github.com/dotnet/maui/issues/13496
 			await Task.Yield();
+#if MACCATALYST
+			await Task.Delay(500); // Add delay for MacCatalyst when page is loaded directly as window root
+#endif
 			this.IsPresented = true;
 		}
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue19657.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue19657.xaml
index 470b8552a130..4d679ac53424 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue19657.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue19657.xaml
@@ -2,6 +2,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue19657"
+             xmlns:local="clr-namespace:Maui.Controls.Sample"
              xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
     <ScrollView>
         <Grid x:Name="contentGrid">
@@ -20,7 +21,7 @@
 
             <Label HorizontalOptions="Center" x:Name="WaitHere" Text="Check if the Carousel items all show up" AutomationId="WaitHere" Background="Red"/>
          
-            <CarouselView x:Name="carousel"
+            <local:CarouselView2 x:Name="carousel"
                          ItemTemplate="{StaticResource SampleItemTemplate}"
                          Loop="False"
                          HeightRequest="220"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue7144.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue7144.cs
index b038fb47f41b..99127dea44ed 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue7144.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue7144.cs
@@ -33,7 +33,7 @@ public Issue7144()
 			return image;
 		});
 
-		CarouselView carouselView = new CarouselView
+		CarouselView2 carouselView = new CarouselView2
 		{
 			ItemsSource = Items,
 			Loop = false,
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1939.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1939.cs
index 9a7d45eaaa92..fad389993f58 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1939.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1939.cs
@@ -57,7 +57,7 @@ async void FillResults(GroupedData results, int items, bool clear)
 		if (!clear)
 			return;
 
-		await Task.Delay(1000);
+		await Task.Delay(1500);
 
 		results.Clear();
 	}
diff --git a/src/Controls/tests/TestCases.HostApp/MauiProgram.cs b/src/Controls/tests/TestCases.HostApp/MauiProgram.cs
index d4b18ba64776..04249485b47d 100644
--- a/src/Controls/tests/TestCases.HostApp/MauiProgram.cs
+++ b/src/Controls/tests/TestCases.HostApp/MauiProgram.cs
@@ -68,6 +68,31 @@ public static Page CreateDefaultMainPage()
 		{
 			Page mainPage = null;
 			OverrideMainPage(ref mainPage);
+#if MACCATALYST
+			// Check for startup test argument from environment variables (passed by test runner)
+			var testName = System.Environment.GetEnvironmentVariable("test");
+
+			if (!string.IsNullOrEmpty(testName))
+			{
+				// Try to get the test page directly from issues/test cases
+				var testCaseScreen = new TestCases.TestCaseScreen();
+				var testPage = testCaseScreen.TryToGetTestPage(testName);
+				if (testPage is not null)
+				{
+					// Return the actual test page
+					return testPage;
+				}
+
+				// If not found in test cases, try to get gallery page
+				var corePageView = new CorePageView(null);
+				var galleryPage = corePageView.TryToGetGalleryPage(testName);
+				if (galleryPage is not null)
+				{
+					// Return the gallery page
+					return galleryPage;
+				}
+			}
+#endif
 			return mainPage ?? new CoreNavigationPage();
 		}
 	}
diff --git a/src/Controls/tests/TestCases.HostApp/TestCases.cs b/src/Controls/tests/TestCases.HostApp/TestCases.cs
index 0683f37a2463..6e4aec66f541 100644
--- a/src/Controls/tests/TestCases.HostApp/TestCases.cs
+++ b/src/Controls/tests/TestCases.HostApp/TestCases.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using System.Linq;
 
 namespace Maui.Controls.Sample
 {
@@ -123,6 +124,7 @@ class IssueModel
 				public string Description { get; set; }
 				public bool IsInternetRequired { get; set; }
 				public Action Action { get; set; }
+				public Func<Page> PageFactory { get; set; }
 
 				public bool Matches(string filter)
 				{
@@ -195,7 +197,9 @@ public TestCaseScreen()
 						 Name = attribute.DisplayName,
 						 Description = attribute.Description,
 						 IsInternetRequired = attribute.IsInternetRequired,
-						 Action = ActivatePageAndNavigate(attribute, type)
+						 Action = ActivatePageAndNavigate(attribute, type),
+						 // PageFactory is used to retrieve the instance of the page.
+						 PageFactory = () => ActivatePage(type)
 					 }).ToList();
 #endif
 
@@ -238,6 +242,23 @@ public bool TryToNavigateTo(string name)
 				return true;
 			}
 
+
+			/// <summary>
+			/// Attempts to retrieve a test page by name or description.
+			/// </summary>
+			/// <param name="name">The name or description of the test page to find.</param>
+			/// <returns>The Page instance if found; otherwise, null.</returns>
+			/// <remarks>
+			/// This method first searches for a matching issue by name (case-insensitive),
+			/// then by description if no match is found by name. If a match is found,
+			/// it invokes the associated PageFactory to create the page.
+			/// </remarks>
+			public Page TryToGetTestPage(string name)
+			{
+				var issue = _issues.SingleOrDefault(x => string.Equals(x.Description, name, StringComparison.OrdinalIgnoreCase));
+				return issue?.PageFactory?.Invoke();
+			}
+
 			public void FilterIssues(string filter = null)
 			{
 				filter = filter?.Trim();
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla53834Test.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla53834Test.png
index a2c27a6c5180..56d15f76842b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla53834Test.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Bugzilla53834Test.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_VerifyVisualState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_VerifyVisualState.png
index 582946f15c47..c5d9bd4c71e1 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_VerifyVisualState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/IndicatorViewWithTemplatedIcon.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/IndicatorViewWithTemplatedIcon.png
index 644af07f668b..1f9f5a22436b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/IndicatorViewWithTemplatedIcon.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/IndicatorViewWithTemplatedIcon.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_VerifyVisualState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_VerifyVisualState.png
index 4dba955f80cf..1c01b248154f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_VerifyVisualState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png
index 14b20abe2023..e7f2743a94fb 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SliderThumbImageShouldRespectColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ToolbarItemsShouldBeVisible.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ToolbarItemsShouldBeVisible.png
index 6c3d8fa53238..f1e1038bc55e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ToolbarItemsShouldBeVisible.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ToolbarItemsShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs
index e44a555e5b31..d9ee6cb45285 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs
@@ -8,6 +8,8 @@ public class BorderUITests : CoreGalleryBasePageTest
 	{
 		const string BorderGallery = "Border Gallery";
 
+		public override string GalleryPageName => BorderGallery;
+		
 		public BorderUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/ButtonUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/ButtonUITests.cs
index 705d07621ec2..678d189ab48f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/ButtonUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/ButtonUITests.cs
@@ -9,6 +9,8 @@ public class ButtonUITests : _ViewUITests
 	{
 		const string ButtonGallery = "Button Gallery";
 
+		public override string GalleryPageName => ButtonGallery;
+		
 		public ButtonUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CarouselViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CarouselViewUITests.cs
index 9c07bbe26102..8ca249677d22 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/CarouselViewUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CarouselViewUITests.cs
@@ -6,22 +6,18 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class CarouselViewUITests : UITest
+	public class CarouselViewUITests : _GalleryUITest
 	{
 		const string CarouselViewGallery = "CarouselView Gallery";
 
+		public override string GalleryPageName => CarouselViewGallery;
+
 		public CarouselViewUITests(TestDevice device) : base(device)
 		{
 		}
 
 		protected override bool ResetAfterEachTest => true;
 
-		public override void TestSetup()
-		{
-			base.TestSetup();
-			App.NavigateToGallery(CarouselViewGallery);
-		}
-
 		[Test]
 		[Category(UITestCategories.CarouselView)]
 		public void CarouselViewSetPosition()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CheckBoxUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CheckBoxUITests.cs
index 958e4c670282..19fe7da9dedc 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/CheckBoxUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CheckBoxUITests.cs
@@ -7,6 +7,8 @@ public class CheckBoxUITests : _ViewUITests
 	{
 		const string CheckBoxGallery = "CheckBox Gallery";
 
+		public override string GalleryPageName => CheckBoxGallery;
+		
 		public CheckBoxUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.EmptyView.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.EmptyView.cs
index 743466273939..67c0100133f7 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.EmptyView.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.EmptyView.cs
@@ -10,6 +10,8 @@ public class CollectionViewEmptyViewTests : CollectionViewUITests
 	{
 		protected override bool ResetAfterEachTest => true;
 
+		public override string GalleryPageName => CollectionViewGallery;
+		
 		public CollectionViewEmptyViewTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.Grouping.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.Grouping.cs
index 685b8181a9fb..7ded7d8ff61e 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.Grouping.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.Grouping.cs
@@ -9,6 +9,8 @@ public class CollectionViewGroupingTests : CollectionViewUITests
 	{
 		protected override bool ResetAfterEachTest => true;
 
+		public override string GalleryPageName => CollectionViewGallery;
+		
 		public CollectionViewGroupingTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.cs
index d026749a8062..9dd88357a683 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CollectionView/CollectionViewUITests.cs
@@ -6,7 +6,9 @@ namespace Microsoft.Maui.TestCases.Tests
 {
 	public abstract class CollectionViewUITests : CoreGalleryBasePageTest
 	{
-		const string CollectionViewGallery = "CollectionView Gallery";
+		public const string CollectionViewGallery = "CollectionView Gallery";
+		
+		public override string GalleryPageName => CollectionViewGallery;
 
 		public CollectionViewUITests(TestDevice device)
 			: base(device)
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/AlertsGalleryTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/AlertsGalleryTests.cs
index 90ce9153c75c..867648503848 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/AlertsGalleryTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/AlertsGalleryTests.cs
@@ -7,6 +7,10 @@ namespace Microsoft.Maui.TestCases.Tests
 {
 	public class AlertsGalleryTests : CoreGalleryBasePageTest
 	{
+		const string AlertsGallery = "Alerts Gallery";
+
+		public override string GalleryPageName => AlertsGallery;
+		
 		public AlertsGalleryTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/FontsGalleryTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/FontsGalleryTests.cs
index 3926c289b7aa..bd310f66f2bb 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/FontsGalleryTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/FontsGalleryTests.cs
@@ -7,6 +7,10 @@ namespace Microsoft.Maui.TestCases.Tests
 	[Category(UITestCategories.Fonts)]
 	public class FontsGalleryTests : CoreGalleryBasePageTest
 	{
+		const string FontsGallery = "Fonts Gallery";
+
+		public override string GalleryPageName => FontsGallery;
+
 		public FontsGalleryTests(TestDevice device)
 			: base(device)
 		{
@@ -14,7 +18,7 @@ public FontsGalleryTests(TestDevice device)
 
 		protected override void NavigateToGallery()
 		{
-			App.NavigateToGallery("Fonts Gallery");
+			App.NavigateToGallery(FontsGallery);
 		}
 
 		[Test]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/ImageLoadingGalleryTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/ImageLoadingGalleryTests.cs
index 350cd18313f5..2e9d2140258b 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/ImageLoadingGalleryTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/ImageLoadingGalleryTests.cs
@@ -7,6 +7,10 @@ namespace Microsoft.Maui.TestCases.Tests
 	[Category(UITestCategories.Image)]
 	public class ImageLoadingGalleryTests : CoreGalleryBasePageTest
 	{
+		const string ImageLoadingGallery = "Image Loading Gallery";
+
+		public override string GalleryPageName => ImageLoadingGallery;
+
 		public ImageLoadingGalleryTests(TestDevice device)
 			: base(device)
 		{
@@ -14,7 +18,7 @@ public ImageLoadingGalleryTests(TestDevice device)
 
 		protected override void NavigateToGallery()
 		{
-			App.NavigateToGallery("Image Loading Gallery");
+			App.NavigateToGallery(ImageLoadingGallery);
 		}
 
 		[Test]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/InputTransparencyGalleryTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/InputTransparencyGalleryTests.cs
index 9e9b2cbc77a7..773a21475314 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/InputTransparencyGalleryTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/InputTransparencyGalleryTests.cs
@@ -10,6 +10,8 @@ public class InputTransparencyGalleryTests : CoreGalleryBasePageTest
 	{
 		const string ButtonGallery = "Input Transparency Gallery";
 
+		public override string GalleryPageName => ButtonGallery;
+		
 		public InputTransparencyGalleryTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs
index d4d6e11b735b..28303bcbde99 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public abstract class CoreGalleryBasePageTest : UITest
+	public abstract class CoreGalleryBasePageTest : _GalleryUITest
 	{
 		public CoreGalleryBasePageTest(TestDevice device) : base(device) { }
 
@@ -16,7 +16,9 @@ protected override void FixtureSetup()
 				try
 				{
 					base.FixtureSetup();
+#if MACCATALYST					
 					NavigateToGallery();
+#endif					
 					break;
 				}
 				catch (Exception e)
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs
index e5de51793575..e69c346e47b1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs
@@ -9,6 +9,7 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class DragAndDropUITests : CoreGalleryBasePageTest
 	{
 		const string DragAndDropGallery = "Drag and Drop Gallery";
+		public override string GalleryPageName => DragAndDropGallery;
 		public DragAndDropUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/EditorUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/EditorUITests.cs
index 0dd7b6ad8b7d..44dc346eba63 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/EditorUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/EditorUITests.cs
@@ -7,6 +7,8 @@ public class EditorUITests : _ViewUITests
 	{
 		public const string EditorGallery = "Editor Gallery";
 
+		public override string GalleryPageName => EditorGallery;
+
 		public EditorUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AbsoluteLayoutFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AbsoluteLayoutFeatureTests.cs
index befe3a5853ba..130066c6cbd1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AbsoluteLayoutFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AbsoluteLayoutFeatureTests.cs
@@ -4,9 +4,10 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class AbsoluteLayoutFeatureTests : UITest
+public class AbsoluteLayoutFeatureTests : _GalleryUITest
 {
 	public const string AbsoluteLayoutFeatureMatrix = "AbsoluteLayout Feature Matrix";
+	public override string GalleryPageName => AbsoluteLayoutFeatureMatrix;
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 	public const string XEntry = "XEntry";
@@ -27,12 +28,6 @@ public AbsoluteLayoutFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(AbsoluteLayoutFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.Layout)]
 	public void VerifyAbsoluteLayout_LayoutBounds()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AppThemeFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AppThemeFeatureTests.cs
index 56f0bb3220c8..9588350e6ac5 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AppThemeFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/AppThemeFeatureTests.cs
@@ -4,17 +4,13 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class AppThemeFeatureTests : UITest
+public class AppThemeFeatureTests : _GalleryUITest
 {
 	public const string AppThemeFeatureMatrix = "App Theme";
-	public AppThemeFeatureTests(TestDevice testDevice) : base(testDevice)
-	{
-	}
+	public override string GalleryPageName => AppThemeFeatureMatrix;
 
-	protected override void FixtureSetup()
+	public AppThemeFeatureTests(TestDevice testDevice) : base(testDevice)
 	{
-		base.FixtureSetup();
-		App.NavigateToGallery(AppThemeFeatureMatrix);
 	}
 
 	public void VerifyScreenshotWithPlatformCropping()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BorderFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BorderFeatureTests.cs
index 88841ab229f8..3735f6398838 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BorderFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BorderFeatureTests.cs
@@ -4,21 +4,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class BorderFeatureTests : UITest
+public class BorderFeatureTests : _GalleryUITest
 {
 	public const string BorderFeatureMatrix = "Border Feature Matrix";
 
+	public override string GalleryPageName => BorderFeatureMatrix;
+
 	public BorderFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(BorderFeatureMatrix);
-	}
-
 	[Test]
 	[Category(UITestCategories.Border)]
 	public void Border_PaddingWithContent_Label()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BoxViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BoxViewFeatureTests.cs
index 2d13e41e15ea..fbe8beb2cb47 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BoxViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/BoxViewFeatureTests.cs
@@ -5,21 +5,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class BoxViewFeatureTests : UITest
+	public class BoxViewFeatureTests : _GalleryUITest
 	{
 		public const string BoxViewFeatureMatrix = "BoxView Feature Matrix";
 
+		public override string GalleryPageName => BoxViewFeatureMatrix;
+
 		public BoxViewFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(BoxViewFeatureMatrix);
-		}
-
 
 		[Test]
 		[Category(UITestCategories.BoxView)]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
index 251ae9b7279b..708200d6d21c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
@@ -6,17 +6,14 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class ButtonFeatureTests : UITest
+public class ButtonFeatureTests : _GalleryUITest
 {
 	public const string ButtonFeatureMatrix = "Button Feature Matrix";
-	public ButtonFeatureTests(TestDevice testDevice) : base(testDevice)
-	{
-	}
 
-	protected override void FixtureSetup()
+	public override string GalleryPageName => ButtonFeatureMatrix;
+
+	public ButtonFeatureTests(TestDevice testDevice) : base(testDevice)
 	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ButtonFeatureMatrix);
 	}
 
 	[Test]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CarouselViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CarouselViewFeatureTests.cs
index f531321cb21a..a302605bc8cb 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CarouselViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CarouselViewFeatureTests.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class CarouselViewFeatureTests : UITest
+public class CarouselViewFeatureTests : _GalleryUITest
 {
 	public const string CarouselViewFeatureMatrix = "CarouselView Feature Matrix";
 	private const string CarouselViewControl = "CarouselViewControl";
@@ -31,14 +31,10 @@ public class CarouselViewFeatureTests : UITest
 	private const string ScrollToIndexEntry = "ScrollToIndexEntry";
 	private const string ScrollToButton = "ScrollToButton";
 
-	public CarouselViewFeatureTests(TestDevice device) : base(device)
-	{
-	}
+	public override string GalleryPageName => CarouselViewFeatureMatrix;
 
-	protected override void FixtureSetup()
+	public CarouselViewFeatureTests(TestDevice device) : base(device)
 	{
-		base.FixtureSetup();
-		App.NavigateToGallery(CarouselViewFeatureMatrix);
 	}
 
 	[Test, Order(1)]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CheckBoxFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CheckBoxFeatureTests.cs
index c7478d3d0fd3..f6b455b8190f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CheckBoxFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CheckBoxFeatureTests.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class CheckBoxFeatureTests : UITest
+public class CheckBoxFeatureTests : _GalleryUITest
 {
 	const string IsCheckedLabel = "IsCheckedLabel";
 	const string CheckBoxControl = "CheckBoxControl";
@@ -18,17 +18,13 @@ public class CheckBoxFeatureTests : UITest
 
 	public const string CheckBoxFeatureMatrix = "CheckBox Feature Matrix";
 
+	public override string GalleryPageName => CheckBoxFeatureMatrix;
+
 	public CheckBoxFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(CheckBoxFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.CheckBox)]
 	public void CheckBox_ValidateDefaultValues_VerifyLabels()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_DynamicChangesFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_DynamicChangesFeatureTests.cs
index df3d9b4e1666..cc862bf758e9 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_DynamicChangesFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_DynamicChangesFeatureTests.cs
@@ -3,24 +3,19 @@
 using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests;
-
-public class CollectionView_DynamicChangesFeatureTests : UITest
+public class CollectionView_DynamicChangesFeatureTests : _GalleryUITest
 {
 	public const string DynamicChangesFeatureMatrix = "CollectionView Feature Matrix";
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 
+	public override string GalleryPageName => DynamicChangesFeatureMatrix;
+
 	public CollectionView_DynamicChangesFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(DynamicChangesFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.CollectionView)]
 	public void ValidateDynamicItemTemplateDisplayed()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_EmptyViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_EmptyViewFeatureTests.cs
index bb67ddf55b56..afbb28ff09e9 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_EmptyViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_EmptyViewFeatureTests.cs
@@ -7,22 +7,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class CollectionView_EmptyViewFeatureTests : UITest
+	public class CollectionView_EmptyViewFeatureTests : _GalleryUITest
 	{
 		public const string CollectionViewFeatureMatrix = "CollectionView Feature Matrix";
 
+		public override string GalleryPageName => CollectionViewFeatureMatrix;
+
 		public CollectionView_EmptyViewFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(CollectionViewFeatureMatrix);
-		}
-
-
 		[Test, Order(1)]
 		[Category(UITestCategories.CollectionView)]
 		public void ValidateEmptyViewStringDisplayed()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_GroupingFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_GroupingFeatureTests.cs
index d22b5bcb5b1c..e7b3f4241e5f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_GroupingFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_GroupingFeatureTests.cs
@@ -3,8 +3,7 @@
 using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests;
-
-public class CollectionView_GroupingFeatureTests : UITest
+public class CollectionView_GroupingFeatureTests : _GalleryUITest
 {
 	public const string GroupingFeatureMatrix = "CollectionView Feature Matrix";
 	public const string Options = "Options";
@@ -20,16 +19,12 @@ public class CollectionView_GroupingFeatureTests : UITest
 	public const string ItemsLayoutHorizontalGrid = "ItemsLayoutHorizontalGrid";
 	public const string ItemsLayoutVerticalGrid = "ItemsLayoutVerticalGrid";
 
+	public override string GalleryPageName => GroupingFeatureMatrix;
 
 	public CollectionView_GroupingFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(GroupingFeatureMatrix);
-	}
 
 	[Test, Order(1)]
 	[Category(UITestCategories.CollectionView)]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_HeaderFooterFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_HeaderFooterFeatureTests.cs
index c2e91b6a9ccc..18d794e5b936 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_HeaderFooterFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_HeaderFooterFeatureTests.cs
@@ -3,8 +3,7 @@
 using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests;
-
-public class CollectionView_HeaderFooterFeatureTests : UITest
+public class CollectionView_HeaderFooterFeatureTests : _GalleryUITest
 {
 	public const string HeaderFooterFeatureMatrix = "CollectionView Feature Matrix";
 	public const string Options = "Options";
@@ -29,17 +28,13 @@ public class CollectionView_HeaderFooterFeatureTests : UITest
 	public const string GroupHeaderTemplateGrid = "GroupHeaderTemplateGrid";
 	public const string GroupFooterTemplateGrid = "GroupFooterTemplateGrid";
 
+	public override string GalleryPageName => HeaderFooterFeatureMatrix;
 
 	public CollectionView_HeaderFooterFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(HeaderFooterFeatureMatrix);
-	}
 
 #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST //In CV2, unintended synchronization between the HeaderTemplate/FooterTemplate and Header/Footer views, related issue: https://github.com/dotnet/maui/issues/28504
 	[Test, Order(1)]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ItemsSourceFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ItemsSourceFeatureTests.cs
index d531787c09bd..f8f3f2f36dab 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ItemsSourceFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ItemsSourceFeatureTests.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class CollectionView_ItemsSourceFeatureTests : UITest
+public class CollectionView_ItemsSourceFeatureTests : _GalleryUITest
 {
 	public const string ItemsSourceFeatureMatrix = "CollectionView Feature Matrix";
 	public const string Options = "Options";
@@ -24,17 +24,13 @@ public class CollectionView_ItemsSourceFeatureTests : UITest
 	public const string MultipleModePreselection = "MultipleModePreselection";
 	public const string SingleModePreselection = "SingleModePreselection";
 
+	public override string GalleryPageName => ItemsSourceFeatureMatrix;
+
 	public CollectionView_ItemsSourceFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ItemsSourceFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.CollectionView)]
 	public void VerifyStringItemsObservableCollectionWhenAddItems()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ScrollingFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ScrollingFeatureTests.cs
index 342dbda62ff3..82fc2db912c9 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ScrollingFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ScrollingFeatureTests.cs
@@ -4,8 +4,7 @@
 
 
 namespace Microsoft.Maui.TestCases.Tests;
-
-public class CollectionView_ScrollingFeatureTests : UITest
+public class CollectionView_ScrollingFeatureTests : _GalleryUITest
 {
 	public const string ScrollingFeatureMatrix = "CollectionView Feature Matrix";
 	public const string Options = "Options";
@@ -26,18 +25,13 @@ public class CollectionView_ScrollingFeatureTests : UITest
 	public const string ItemsLayoutHorizontalList = "ItemsLayoutHorizontalList";
 	public const string AddButton = "AddButton";
 
+	public override string GalleryPageName => ScrollingFeatureMatrix;
 
 	public CollectionView_ScrollingFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ScrollingFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.CollectionView)]
 	public void VerifyMeasureAllItemsWithObservableCollection()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_SelectionFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_SelectionFeatureTests.cs
index b10c396cc015..478d5b436408 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_SelectionFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_SelectionFeatureTests.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class CollectionView_SelectionFeatureTests : UITest
+public class CollectionView_SelectionFeatureTests : _GalleryUITest
 {
 	public const string SelectionFeatureMatrix = "CollectionView Feature Matrix";
 	public const string ItemsSourceGroupedList = "ItemsSourceGroupedList";
@@ -27,17 +27,14 @@ public class CollectionView_SelectionFeatureTests : UITest
 	public const string CurrentSelectionTextLabel = "CurrentSelectionTextLabel";
 	public const string PreviousSelectionTextLabel = "PreviousSelectionTextLabel";
 	public const string SelectionChangedEventCountLabel = "SelectionChangedEventCountLabel";
+
+	public override string GalleryPageName => SelectionFeatureMatrix;
+
 	public CollectionView_SelectionFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(SelectionFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.CollectionView)]
 	public void VerifySelectionModeNoneWhenItemsSourceNone()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentPageFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentPageFeatureTests.cs
index 9b991de09f6f..f576763cf052 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentPageFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentPageFeatureTests.cs
@@ -5,21 +5,16 @@
 namespace Microsoft.Maui.TestCases.Tests
 {
 	[Category(UITestCategories.Page)]
-	public class ContentPageFeatureTests : UITest
+	public class ContentPageFeatureTests : _GalleryUITest
 	{
 		public const string ContentPageFeatureMatrix = "ContentPage Feature Matrix";
+		public override string GalleryPageName => ContentPageFeatureMatrix;
 
 		public ContentPageFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(ContentPageFeatureMatrix);
-		}
-
 		[Test]
 		public void ContentPage_zContent()
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentViewFeatureTests.cs
index f001048fa6d5..f55e55aa3c0a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ContentViewFeatureTests.cs
@@ -5,21 +5,16 @@
 namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.ViewBaseTests)]
-public class ContentViewFeatureTests : UITest
+public class ContentViewFeatureTests : _GalleryUITest
 {
 	public const string ContentViewFeatureMatrix = "ContentView Feature Matrix";
+	public override string GalleryPageName => ContentViewFeatureMatrix;
 
 	public ContentViewFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ContentViewFeatureMatrix);
-	}
-
 	[Test]
 	public void ContentViewWithDefaultLayoutContent()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs
index 4837cbba4e88..e9ec5214a976 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs
@@ -5,18 +5,14 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class DatePickerFeatureTests : UITest
+public class DatePickerFeatureTests : _GalleryUITest
 {
 	public const string DatePickerFeatureMatrix = "Date Picker Feature Matrix";
 
-	public DatePickerFeatureTests(TestDevice testDevice) : base(testDevice)
-	{
-	}
+	public override string GalleryPageName => DatePickerFeatureMatrix;
 
-	protected override void FixtureSetup()
+	public DatePickerFeatureTests(TestDevice testDevice) : base(testDevice)
 	{
-		base.FixtureSetup();
-		App.NavigateToGallery(DatePickerFeatureMatrix);
 	}
 
 #if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_IOS //Issue Link: https://github.com/dotnet/maui/issues/30736, https://github.com/dotnet/maui/issues/31167
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EditorFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EditorFeatureTests.cs
index 357cbf6dead6..f2ba5a1eebfc 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EditorFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EditorFeatureTests.cs
@@ -5,10 +5,12 @@
 namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.Editor)]
-public class EditorFeatureTests : UITest
+public class EditorFeatureTests : _GalleryUITest
 {
 	public const string EditorFeatureMatrix = "Editor Feature Matrix";
 
+	public override string GalleryPageName => EditorFeatureMatrix;
+
 #if IOS
 	private const int CropBottomValue = 1550;
 #elif ANDROID
@@ -24,12 +26,6 @@ public EditorFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(EditorFeatureMatrix);
-	}
-
 	[Test, Order(0)]
 	public void VerifyEditorInitialEventStates()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
index 2039a8561f67..f1dfc5b91219 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
@@ -5,10 +5,12 @@
 namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.Entry)]
-public class EntryFeatureTests : UITest
+public class EntryFeatureTests : _GalleryUITest
 {
 	public const string EntryFeatureMatrix = "Entry Feature Matrix";
 
+	public override string GalleryPageName => EntryFeatureMatrix;
+
 #if IOS
 	private const int CropBottomValue = 1550;
 #elif ANDROID
@@ -24,12 +26,6 @@ public EntryFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(EntryFeatureMatrix);
-	}
-
 	[Test, Order(0)]
 	public void VerifyInitialEventStates()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlexLayoutFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlexLayoutFeatureTests.cs
index 8a4e1454f819..1036cf33d62c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlexLayoutFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlexLayoutFeatureTests.cs
@@ -5,18 +5,13 @@
 namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.Layout)]
-public class FlexLayoutFeatureTests : UITest
+public class FlexLayoutFeatureTests : _GalleryUITest
 {
     public const string FlexLayoutFeatureMatrix = "FlexLayout Feature Matrix";
+    public override string GalleryPageName => FlexLayoutFeatureMatrix;
 
     public FlexLayoutFeatureTests(TestDevice device) : base(device) { }
 
-    protected override void FixtureSetup()
-    {
-        base.FixtureSetup();
-        App.NavigateToGallery(FlexLayoutFeatureMatrix);
-    }
-
     [Test, Order(1)]
     public void FlexLayout_ValidateDefaultValues()
     {
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlyoutPageFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlyoutPageFeatureTests.cs
index 6a59d939a035..19fd79fe8fd2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlyoutPageFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/FlyoutPageFeatureTests.cs
@@ -4,9 +4,10 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class FlyoutPageFeatureTests : UITest
+public class FlyoutPageFeatureTests : _GalleryUITest
 {
 	public const string FlyoutPageFeatureMatrix = "Flyout Feature Matrix";
+	public override string GalleryPageName => FlyoutPageFeatureMatrix;
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 	public const string FlowDirectionRTL = "FlowDirectionRTL";
@@ -27,12 +28,6 @@ public FlyoutPageFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(FlyoutPageFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.FlyoutPage)]
 	public void VerifyFlyoutPage_NavigationEvents()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs
index 7bff08acdb06..2675aa171f48 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs
@@ -4,21 +4,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class GraphicsViewFeatureTests : UITest
+public class GraphicsViewFeatureTests : _GalleryUITest
 {
 	public const string GraphicsViewFeatureMatrix = "GraphicsView Feature Matrix";
 
+	public override string GalleryPageName => GraphicsViewFeatureMatrix;
+
 	public GraphicsViewFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(GraphicsViewFeatureMatrix);
-	}
-
 	public void VerifyShapeScreenshot()
 	{
 #if WINDOWS
@@ -30,6 +26,7 @@ public void VerifyShapeScreenshot()
 
 	#region Default Values and Initial State Tests
 
+#if TEST_FAILS_ON_CATALYST // On MacCatalyst, when the test case is executed directly, the cursor automatically stays centered on the screen. Because of this, the cursor interacts with the GraphicsView and triggers the StartHoverInteraction event in CI. To avoid this false interaction, the test case is restricted.
 	[Test, Order(1)]
 	[Category(UITestCategories.GraphicsView)]
 	public void GraphicsView_ValidateDefaultValues_VerifyInitialState()
@@ -47,7 +44,7 @@ public void GraphicsView_ValidateDefaultValues_VerifyInitialState()
 		var interactionLabel = App.FindElement("InteractionEventLabel");
 		Assert.That(interactionLabel.GetText(), Is.EqualTo("No interactions yet"));
 	}
-
+#endif
 	#endregion
 
 	#region Drawable Type Tests
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GridFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GridFeatureTests.cs
index 33fbf077fd25..3016c1815a86 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GridFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GridFeatureTests.cs
@@ -5,9 +5,10 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class GridFeatureTests : UITest
+public class GridFeatureTests : _GalleryUITest
 {
 	public const string GridFeatureMatrix = "Grid Feature Matrix";
+	public override string GalleryPageName => GridFeatureMatrix;
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 	public const string RowEntry = "RowEntry";
@@ -26,12 +27,6 @@ public GridFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(GridFeatureMatrix);
-	}
-
 	[Test]
 	[Category(UITestCategories.Layout)]
 	public void VerifyGrid_SetRow()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/HybridWebViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/HybridWebViewFeatureTests.cs
index 04836f6c5622..269b70c5ea06 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/HybridWebViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/HybridWebViewFeatureTests.cs
@@ -5,22 +5,18 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class HybridWebViewFeatureTests : UITest
+public class HybridWebViewFeatureTests : _GalleryUITest
 {
 	public const string HybridWebViewFeatureMatrix = "HybridWebView Feature Matrix";
 
+	public override string GalleryPageName => HybridWebViewFeatureMatrix;
+
 
 	public HybridWebViewFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(HybridWebViewFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.WebView)]
 	public void VerifyHybridWebView_DefaultValues()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageButtonFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageButtonFeatureTests.cs
index 5de5bc278927..5a183907e0c6 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageButtonFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageButtonFeatureTests.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class ImageButtonFeatureTests : UITest
+public class ImageButtonFeatureTests : _GalleryUITest
 {
 	public const string ImageButtonFeatureMatrix = "ImageButton Feature Matrix";
 	public const string Options = "Options";
@@ -28,18 +28,13 @@ public class ImageButtonFeatureTests : UITest
 	public const string IsEnabledFalse = "IsEnabledFalse";
 	public const string PaddingEntry = "PaddingEntry";
 
+	public override string GalleryPageName => ImageButtonFeatureMatrix;
 
 	public ImageButtonFeatureTests(TestDevice device)
 	: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ImageButtonFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.ImageButton)]
 	public void VerifyImageButtonAspect_AspectFitWithImageSourceFromFile()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageFeatureTests.cs
index 2cb90c8d4307..27998423a4d8 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ImageFeatureTests.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class ImageFeatureTests : UITest
+public class ImageFeatureTests : _GalleryUITest
 {
 	public const string ImageFeatureMatrix = "Image Feature Matrix";
 	public const string Options = "Options";
@@ -24,18 +24,13 @@ public class ImageFeatureTests : UITest
 	public const string IsAnimationTrue = "IsAnimationTrue";
 	public const string IsAnimationFalse = "IsAnimationFalse";
 
+	public override string GalleryPageName => ImageFeatureMatrix;
 
 	public ImageFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ImageFeatureMatrix);
-	}
-
 	[Test]
 	[Category(UITestCategories.Image)]
 	public void VerifyImageAspect_AspectFitWithImageSourceFromFile()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/IndicatorViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/IndicatorViewFeatureTests.cs
index 3befa9415c46..70602fa5d566 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/IndicatorViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/IndicatorViewFeatureTests.cs
@@ -6,9 +6,10 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class IndicatorViewFeatureTests : UITest
+public class IndicatorViewFeatureTests : _GalleryUITest
 {
 	private const string IndicatorViewFeatureMatrix = "IndicatorView Feature Matrix";
+	public override string GalleryPageName => IndicatorViewFeatureMatrix;
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 	public const string IndicatorColorBrownButton = "IndicatorColorBrownButton";
@@ -38,12 +39,6 @@ public IndicatorViewFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(IndicatorViewFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.IndicatorView)]
 	public void VerifyIndicatorColor()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
index 516c51c20c8c..483bc97328c3 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class LabelFeatureTests : UITest
+public class LabelFeatureTests : _GalleryUITest
 {
 	public const string LabelFeatureMatrix = "Label Feature Matrix";
 	public const string Options = "Options";
@@ -46,18 +46,13 @@ public class LabelFeatureTests : UITest
 	public const string LineBreakModeNoWrap = "LineBreakModeNoWrap";
 	public const string MainLabel = "MainLabel";
 
+	public override string GalleryPageName => LabelFeatureMatrix;
 
 	public LabelFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(LabelFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.Label)]
 	public void VerifyLabelWithFormattedText()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/NavigationPageFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/NavigationPageFeatureTests.cs
index 82746acd2668..98e419010c79 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/NavigationPageFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/NavigationPageFeatureTests.cs
@@ -6,18 +6,13 @@
 namespace Microsoft.Maui.TestCases.Tests
 {
 	[Category(UITestCategories.Navigation)]
-	public class NavigationPageFeatureTests : UITest
+	public class NavigationPageFeatureTests : _GalleryUITest
 	{
 		public const string NavigationPageFeatureMatrix = "NavigationPage Feature Matrix";
+		public override string GalleryPageName => NavigationPageFeatureMatrix;
 
 		public NavigationPageFeatureTests(TestDevice device) : base(device) { }
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(NavigationPageFeatureMatrix);
-		}
-
 		[Test, Order(1)]
 		public void EntryPoints_AreVisible()
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/PickerFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/PickerFeatureTests.cs
index 510dd025bd9a..4992e8641ea4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/PickerFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/PickerFeatureTests.cs
@@ -4,21 +4,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class PickerFeatureTests : UITest
+	public class PickerFeatureTests : _GalleryUITest
 	{
 		public const string PickerFeatureMatrix = "Picker Feature Matrix";
+		public override string GalleryPageName => PickerFeatureMatrix;
 
 		public PickerFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(PickerFeatureMatrix);
-		}
-
 		public void VerifyPickerScreenshot()
 		{
 #if WINDOWS
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ProgressBarFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ProgressBarFeatureTests.cs
index 678e8bf3b79c..508f8c7e9153 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ProgressBarFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ProgressBarFeatureTests.cs
@@ -4,19 +4,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class ProgressBarFeatureTests : UITest
+	public class ProgressBarFeatureTests : _GalleryUITest
 	{
+		public const string ProgressBarFeatureMatrix = "ProgressBar Feature Matrix";
+
+		public override string GalleryPageName => ProgressBarFeatureMatrix;
+
 		public ProgressBarFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery("ProgressBar Feature Matrix");
-		}
-
 		[Test, Order(1)]
 		[Category(UITestCategories.ProgressBar)]
 		public void ProgressBar_ValidateDefaultProgress()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RadioButtonFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RadioButtonFeatureTests.cs
index 40a84b912c8c..9bd4c72f047c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RadioButtonFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RadioButtonFeatureTests.cs
@@ -4,21 +4,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class RadioButtonFeatureTests : UITest
+public class RadioButtonFeatureTests : _GalleryUITest
 {
 	public const string RadioButtonFeatureMatrix = "RadioButton Feature Matrix";
 
+	public override string GalleryPageName => RadioButtonFeatureMatrix;
+
 	public RadioButtonFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(RadioButtonFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.RadioButton)]
 	public void RadioButton_Checking_Default_Configuration_VerifyVisualState()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RefreshViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RefreshViewFeatureTests.cs
index 2923368e055b..c79986ccd5bd 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RefreshViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/RefreshViewFeatureTests.cs
@@ -4,21 +4,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class RefreshViewFeatureTests : UITest
+public class RefreshViewFeatureTests : _GalleryUITest
 {
 	public const string RefreshViewFeatureMatrix = "RefreshView Feature Matrix";
+	public override string GalleryPageName => RefreshViewFeatureMatrix;
 
 	public RefreshViewFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(RefreshViewFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.RefreshView)]
 	public void RefreshView_ValidateDefaultValues_VerifyLabels()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewFeatureTests.cs
index 2f7d0b5e45a3..3c9aa9818832 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewFeatureTests.cs
@@ -5,9 +5,10 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class ScrollViewFeatureTests : UITest
+public class ScrollViewFeatureTests : _GalleryUITest
 {
 	public const string ScrollViewFeatureMatrix = "ScrollView Feature Matrix";
+	public override string GalleryPageName => ScrollViewFeatureMatrix;
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 	public const string ContentLabel = "ContentLabel";
@@ -39,12 +40,6 @@ public ScrollViewFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ScrollViewFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.ScrollView)]
 	public void VerifyScrollViewWithScrollToPositionEnd()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewWithLayoutOptionsFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewWithLayoutOptionsFeatureTests.cs
index 669f528f2a11..f119a98b9503 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewWithLayoutOptionsFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollViewWithLayoutOptionsFeatureTests.cs
@@ -5,9 +5,10 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class ScrollViewWithLayoutOptionsFeatureTests : UITest
+public class ScrollViewWithLayoutOptionsFeatureTests : _GalleryUITest
 {
 	public const string ScrollViewWithLayoutOptionsFeatureMatrix = "ScrollView With LayoutOptions Feature Matrix";
+	public override string GalleryPageName => ScrollViewWithLayoutOptionsFeatureMatrix;
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 	public const string HorizontalStart = "HorizontalStart";
@@ -31,12 +32,6 @@ public ScrollViewWithLayoutOptionsFeatureTests(TestDevice device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ScrollViewWithLayoutOptionsFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.ScrollView)]
 	public void VerifyLayoutWithOrientationVertical_HorizontalOptionsStart()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicFlexWithChildrenFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicFlexWithChildrenFeatureTests.cs
index 12acba1a0146..cfcfd56837d1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicFlexWithChildrenFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicFlexWithChildrenFeatureTests.cs
@@ -7,21 +7,16 @@ namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.ScrollView)]
 
-public class ScrollView_DynamicFlexWithChildrenFeatureTests : UITest
+public class ScrollView_DynamicFlexWithChildrenFeatureTests : _GalleryUITest
 {
 
 	public const string ScrollViewDynamicFlexWithChildrenFeatureTests = "ScrollView With LayoutOptions Feature Matrix";
+	public override string GalleryPageName => ScrollViewDynamicFlexWithChildrenFeatureTests;
 	public ScrollView_DynamicFlexWithChildrenFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ScrollViewDynamicFlexWithChildrenFeatureTests);
-	}
-
 	[Test, Order(1)]
 	public void VerifyFlexWithAddChildren_RowDirection()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicGridWithChildrenFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicGridWithChildrenFeatureTests.cs
index 8c86e249b419..7c2bc6812099 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicGridWithChildrenFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicGridWithChildrenFeatureTests.cs
@@ -7,21 +7,17 @@ namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.ScrollView)]
 
-public class ScrollView_DynamicGridWithChildrenFeatureTests : UITest
+public class ScrollView_DynamicGridWithChildrenFeatureTests : _GalleryUITest
 {
 
 	public const string ScrollViewDynamicGridWithChildrenFeatureTests = "ScrollView With LayoutOptions Feature Matrix";
+	public override string GalleryPageName => ScrollViewDynamicGridWithChildrenFeatureTests;
+
 	public ScrollView_DynamicGridWithChildrenFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ScrollViewDynamicGridWithChildrenFeatureTests);
-	}
-
 	[Test, Order(1)]
 	public void VerifyGridWithAddChildren_RowWise()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicStackWithChildrenFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicStackWithChildrenFeatureTests.cs
index a3399cfc08ad..4fd9f1a6e886 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicStackWithChildrenFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ScrollView_DynamicStackWithChildrenFeatureTests.cs
@@ -7,21 +7,16 @@ namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.ScrollView)]
 
-public class ScrollView_DynamicStackWithChildrenFeatureTests : UITest
+public class ScrollView_DynamicStackWithChildrenFeatureTests : _GalleryUITest
 {
 
 	public const string ScrollViewDynamicStackWithChildrenFeatureTests = "ScrollView With LayoutOptions Feature Matrix";
+	public override string GalleryPageName => ScrollViewDynamicStackWithChildrenFeatureTests;
 	public ScrollView_DynamicStackWithChildrenFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ScrollViewDynamicStackWithChildrenFeatureTests);
-	}
-
 	[Test, Order(1)]
 	public void VerifyStackWithAddChildren_OrientationVertical()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SearchBarFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SearchBarFeatureTests.cs
index 2cb2ff4f8f7f..7e5a36fd8577 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SearchBarFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SearchBarFeatureTests.cs
@@ -4,18 +4,14 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class SearchBarFeatureTests : UITest
+public class SearchBarFeatureTests : _GalleryUITest
 {
 	public const string SearchBarFeatureMatrix = "Search Bar Feature Matrix";
 
-	public SearchBarFeatureTests(TestDevice testDevice) : base(testDevice)
-	{
-	}
+	public override string GalleryPageName => SearchBarFeatureMatrix;
 
-	protected override void FixtureSetup()
+	public SearchBarFeatureTests(TestDevice testDevice) : base(testDevice)
 	{
-		base.FixtureSetup();
-		App.NavigateToGallery(SearchBarFeatureMatrix);
 	}
 
 	public void VerifyScreenshotWithPlatformCropping()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShadowFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShadowFeatureTests.cs
index 057804cf87f9..fa764bee2ccd 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShadowFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShadowFeatureTests.cs
@@ -4,21 +4,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class ShadowFeatureTests : UITest
+	public class ShadowFeatureTests : _GalleryUITest
 	{
 		public const string ShadowFeatureMatrix = "Shadow Feature Matrix";
 
+		public override string GalleryPageName => ShadowFeatureMatrix;
+
 		public ShadowFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(ShadowFeatureMatrix);
-		}
-
 		[Test, Order(1)]
 		[Category(UITestCategories.Shadow)]
 		public void Shadow_SetColor()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShapesFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShapesFeatureTests.cs
index 83b306176adb..6b386fa22735 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShapesFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShapesFeatureTests.cs
@@ -5,21 +5,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class ShapesFeatureTests : UITest
+public class ShapesFeatureTests : _GalleryUITest
 {
 	public const string ShapesFeatureMatrix = "Shapes Feature Matrix";
+	public override string GalleryPageName => ShapesFeatureMatrix;
 
 	public ShapesFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ShapesFeatureMatrix);
-	}
-
 	public void VerifyShapeScreenshot()
 	{
 #if WINDOWS
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SliderFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SliderFeatureTests.cs
index ea9b802619e8..edaae9a1d4da 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SliderFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SliderFeatureTests.cs
@@ -5,21 +5,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class SliderFeatureTests : UITest
+	public class SliderFeatureTests : _GalleryUITest
 	{
 		public const string SliderFeatureMatrix = "Slider Feature Matrix";
 
+		public override string GalleryPageName => SliderFeatureMatrix;
+
 		public SliderFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(SliderFeatureMatrix);
-		}
-
 		[Test, Order(1)]
 		[Category(UITestCategories.Slider)]
 		public void Slider_ValidateDefaultValues_VerifyLabels()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StackLayoutFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StackLayoutFeatureTests.cs
index 7699d6fd661e..a59f3663fcaf 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StackLayoutFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StackLayoutFeatureTests.cs
@@ -5,21 +5,16 @@
 namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.Layout)]
-public class StackLayoutFeatureTests : UITest
+public class StackLayoutFeatureTests : _GalleryUITest
 {
 	public const string StackLayoutFeatureMatrix = "StackLayout Feature Matrix";
+	public override string GalleryPageName => StackLayoutFeatureMatrix;
 
 	public StackLayoutFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(StackLayoutFeatureMatrix);
-	}
-
 	[Test]
 	public void HorizontalStackLayout_IsVisible()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StepperFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StepperFeatureTests.cs
index e8e7fbf56feb..6d4db6cb8942 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StepperFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StepperFeatureTests.cs
@@ -5,21 +5,17 @@
 namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.Stepper)]
-public class StepperFeatureTests : UITest
+public class StepperFeatureTests : _GalleryUITest
 {
 	public const string StepperFeatureMatrix = "Stepper Feature Matrix";
 
+	public override string GalleryPageName => StepperFeatureMatrix;
+
 	public StepperFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(StepperFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	public void Stepper_ValidateDefaultValues_VerifyLabels()
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwipeViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwipeViewFeatureTests.cs
index 048fb253db2a..d1cee4241cde 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwipeViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwipeViewFeatureTests.cs
@@ -4,21 +4,16 @@
 namespace Microsoft.Maui.TestCases.Tests;
 
 [Category(UITestCategories.SwipeView)]
-public class SwipeViewFeatureTests : UITest
+public class SwipeViewFeatureTests : _GalleryUITest
 {
 	public const string SwipeViewFeatureMatrix = "SwipeView Feature Matrix";
+	public override string GalleryPageName => SwipeViewFeatureMatrix;
 
 	public SwipeViewFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(SwipeViewFeatureMatrix);
-	}
-
 #if TEST_FAILS_ON_WINDOWS //related issue link: https://github.com/dotnet/maui/issues/30949 && https://github.com/dotnet/maui/issues/30947
 	[Test, Order(1)]
 	public void VerifySwipeViewWhenLabelSwipeItemAndEvents()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwitchFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwitchFeatureTests.cs
index 8e5a3e055b08..57d1171f4080 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwitchFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/SwitchFeatureTests.cs
@@ -5,21 +5,17 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class SwitchFeatureTests : UITest
+public class SwitchFeatureTests : _GalleryUITest
 {
 	public const string SwitchFeatureMatrix = "Switch Feature Matrix";
 
+	public override string GalleryPageName => SwitchFeatureMatrix;
+
 	public SwitchFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(SwitchFeatureMatrix);
-	}
-
 	[Test, Order(1)]
 	[Category(UITestCategories.Switch)]
 	public void Switch_InitialState_VerifyVisualState()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TimePickerFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TimePickerFeatureTests.cs
index 2a690b472359..012c52c083d1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TimePickerFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TimePickerFeatureTests.cs
@@ -6,17 +6,14 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class TimePickerFeatureTests : UITest
+public class TimePickerFeatureTests : _GalleryUITest
 {
 	public const string TimePickerFeatureMatrix = "Time Picker Feature Matrix";
+	public override string GalleryPageName => TimePickerFeatureMatrix;
+
 	public TimePickerFeatureTests(TestDevice testDevice) : base(testDevice)
 	{
 	}
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(TimePickerFeatureMatrix);
-	}
 
 #if TEST_FAILS_ON_IOS // Issue Link - https://github.com/dotnet/maui/issues/30837
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TitleBarFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TitleBarFeatureTests.cs
index 06ffe26bef07..b11cee08122a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TitleBarFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TitleBarFeatureTests.cs
@@ -6,21 +6,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class TitleBarFeatureTests : UITest
+public class TitleBarFeatureTests : _GalleryUITest
 {
 	public const string TitleBarFeatureMatrix = "TitleBar Feature Matrix";
+	public override string GalleryPageName => TitleBarFeatureMatrix;
 
 	public TitleBarFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(TitleBarFeatureMatrix);
-	}
-
 	[Test]
 	[Category(UITestCategories.TitleView)]
 	public void TitleBar_Window()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ToolbarFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ToolbarFeatureTests.cs
index a132f02ce185..c19867663df5 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ToolbarFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ToolbarFeatureTests.cs
@@ -4,22 +4,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class ToolbarFeatureTests : UITest
+public class ToolbarFeatureTests : _GalleryUITest
 {
 	public const string ToolbarFeatureMatrix = "Toolbar Feature Matrix";
+	public override string GalleryPageName => ToolbarFeatureMatrix;
 
 	public ToolbarFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
 
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(ToolbarFeatureMatrix);
-	}
-
-
 	[Test, Order(1)]
 	[Category(UITestCategories.ToolbarItem)]
 	public void VerifyPrimaryToolBar_DisabledState()
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TwoPaneViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TwoPaneViewFeatureTests.cs
index 50edb4b14304..ba83da357be4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TwoPaneViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TwoPaneViewFeatureTests.cs
@@ -5,21 +5,16 @@
 
 namespace Microsoft.Maui.TestCases.Tests
 {
-	public class TwoPaneViewFeatureTests : UITest
+	public class TwoPaneViewFeatureTests : _GalleryUITest
 	{
 		public const string TwoPaneViewFeatureMatrix = "TwoPaneView Feature Matrix";
+		public override string GalleryPageName => TwoPaneViewFeatureMatrix;
 
 		public TwoPaneViewFeatureTests(TestDevice device)
 			: base(device)
 		{
 		}
 
-		protected override void FixtureSetup()
-		{
-			base.FixtureSetup();
-			App.NavigateToGallery(TwoPaneViewFeatureMatrix);
-		}
-
 		// The test cases below are divided based on platform-specific UI behaviors and layout logic.
 		//
 		// For MACCATALYST and WINDOWS:
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/WebViewFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/WebViewFeatureTests.cs
index 0ddd2bb7d7e6..2e829ffdc917 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/WebViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/WebViewFeatureTests.cs
@@ -4,9 +4,10 @@
 using UITest.Core;
 namespace Microsoft.Maui.TestCases.Tests;
 
-public class WebViewFeatureTests : UITest
+public class WebViewFeatureTests : _GalleryUITest
 {
 	public const string WebViewFeatureMatrix = "WebView Feature Matrix";
+	public override string GalleryPageName => WebViewFeatureMatrix;
 	public const string Options = "Options";
 	public const string Apply = "Apply";
 	public const string WebViewControl = "WebViewControl";
@@ -26,11 +27,6 @@ public WebViewFeatureTests(TestDevice device)
 		: base(device)
 	{
 	}
-	protected override void FixtureSetup()
-	{
-		base.FixtureSetup();
-		App.NavigateToGallery(WebViewFeatureMatrix);
-	}
 
 	[Test, Order(1)]
 	[Category(UITestCategories.WebView)]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs
index 3e6cdfdac23f..08a553d8c750 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs
@@ -8,6 +8,9 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class GestureRecognizerUITests : CoreGalleryBasePageTest
 	{
 		const string GestureRecognizerGallery = "Gesture Recognizer Gallery";
+		
+		public override string GalleryPageName => GestureRecognizerGallery;
+
 		public GestureRecognizerUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageButtonUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageButtonUITests.cs
index d74aeacc0b85..9a3f2f7c27b1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageButtonUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageButtonUITests.cs
@@ -9,6 +9,8 @@ internal class ImageButtonUITests : _ViewUITests
 {
 	const string ImageButtonGallery = "Image Button Gallery";
 
+	public override string GalleryPageName => ImageButtonGallery;
+	
 	public ImageButtonUITests(TestDevice device)
 		: base(device)
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageUITests.cs
index 72766aeb41ae..258323bf72b2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/ImageUITests.cs
@@ -9,6 +9,8 @@ internal class ImageUITests : _ViewUITests
 {
 	const string ImageGallery = "Image Gallery";
 
+	public override string GalleryPageName => ImageGallery;
+	
 	public ImageUITests(TestDevice device)
 		: base(device)
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37841.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37841.cs
index ac942dea3d7d..bf9094382d0f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37841.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla37841.cs
@@ -20,6 +20,7 @@ public Bugzilla37841(TestDevice testDevice) : base(testDevice)
 	public void TextAndEntryCellsDataBindInTableView()
 	{
 		App.WaitForElement(Generate);
+		Thread.Sleep(500); // Add a small delay after WaitForElement to let the UI fully settle before attempting the tap
 		App.Tap(Generate);
 
 		App.WaitForTextToBePresentInElement(entrycell, "12345");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla40092.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla40092.cs
index 6dd6b47b29cf..e0db03b86eb4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla40092.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla40092.cs
@@ -20,7 +20,7 @@ public Bugzilla40092(TestDevice testDevice) : base(testDevice)
 	[Category(UITestCategories.BoxView)]
 	public void AllScreenIsBlack()
 	{
-#if !ANDROID // Display alert not shown in android also this is not a needed one for ensuring this case, so ignored the below steps on Android.
+#if !ANDROID && !MACCATALYST // Display alert is not shown on Android, and it is not required to validate this case, so the following steps are skipped for Android. For Catalyst, the test page loading flow has been modified, making the popup validation unnecessary here as well.
 		App.TapDisplayAlertButton(Ok);
 #else
 		App.WaitForElement("black");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53179.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53179.cs
index f244aed86b17..80567ecd5578 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53179.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla53179.cs
@@ -16,14 +16,14 @@ public Bugzilla53179(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.Navigation)]
 		public void Bugzilla53179Test()
 		{
-			App.WaitForElement("Next Page");
-			App.Tap("Next Page");
+			App.WaitForElement("Next Page 1");
+			App.Tap("Next Page 1");
 
-			App.WaitForElementTillPageNavigationSettled("Next Page");
-			App.Tap("Next Page");
+			App.WaitForElementTillPageNavigationSettled("Next Page 2");
+			App.Tap("Next Page 2");
 
-			App.WaitForElementTillPageNavigationSettled("Next Page");
-			App.Tap("Next Page");
+			App.WaitForElementTillPageNavigationSettled("Next Page 3");
+			App.Tap("Next Page 3");
 
 			App.WaitForElementTillPageNavigationSettled("Remove previous pages");
 			App.Tap("Remove previous pages");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59172.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59172.cs
index dde773d9fb24..b1274e39bfab 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59172.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59172.cs
@@ -15,7 +15,7 @@ public Bugzilla59172(TestDevice testDevice) : base(testDevice)
 		// Test scenario: Tapping the GoBack link triggers a PopAsync 2500ms after the tap event.
 		//   Right before PopAsync is triggered, manually navigate back pressing the back arrow in the navigation bar
 
-		[Test]
+		[Test, Order(1)]
 		[Category(UITestCategories.Navigation)]
 		public void Issue59172Test()
 		{
@@ -29,7 +29,7 @@ public void Issue59172Test()
 			App.WaitForElementTillPageNavigationSettled("GoForward");
 		}
 
-		[Test]
+		[Test, Order(2)]
 		[Category(UITestCategories.Navigation)]
 		public void Issue59172RecoveryTest()
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59718.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59718.cs
index cddf7e23e98f..8c6819c8469a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59718.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla59718.cs
@@ -23,6 +23,7 @@ public Bugzilla59718(TestDevice testDevice) : base(testDevice)
 	public void Bugzilla59718Test()
 	{
 		App.WaitForElement(Target1);
+		Thread.Sleep(500); // Add a small delay after WaitForElement to let the UI fully settle before attempting the tap
 		App.Tap(Target1);
 
 		App.WaitForElementTillPageNavigationSettled(Target1b);
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CollectionViewUI.CollectionViewVisibility.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CollectionViewUI.CollectionViewVisibility.cs
deleted file mode 100644
index 5e027f9eb8f7..000000000000
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/CollectionViewUI.CollectionViewVisibility.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using NUnit.Framework;
-using UITest.Appium;
-using UITest.Core;
-
-namespace Microsoft.Maui.TestCases.Tests.Issues
-{
-	public class CollectionViewVisibilityUITests : _IssuesUITest
-	{
-		const string Success = "Success";
-		const string Show = "Show";
-
-		public CollectionViewVisibilityUITests(TestDevice device)
-			: base(device)
-		{
-		}
-
-		public override string Issue => "iOS application suspended at UICollectionViewFlowLayout.PrepareLayout() when using IsVisible = false";
-
-		// InitiallyInvisbleCollectionViewSurvivesiOSLayoutNonsense(src\Compatibility\ControlGallery\src\Issues.Shared\Issue12714.cs)
-		[Test]
-		[Category(UITestCategories.CollectionView)]
-		public void InitiallyInvisbleCollectionViewSurvivesiOSLayoutNonsense()
-		{
-			App.WaitForElement(Show);
-			App.Click(Show);
-			App.WaitForElement(Success);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2883.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2883.cs
index 01e5daf802dd..e0aaaaf8bdea 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2883.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2883.cs
@@ -17,6 +17,7 @@ public Issue2883(TestDevice testDevice) : base(testDevice)
 	public void Issue2883TestDisabled()
 	{
 		App.WaitForElement("btnCustomCellTable");
+		Thread.Sleep(500); // Add a small delay after WaitForElement to let the UI fully settle before attempting the tap
 		App.Tap("btnCustomCellTable");
 		App.WaitForNoElement("Clicked");
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2951.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2951.cs
index 03c6c94562c9..d38c4faa81e1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2951.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue2951.cs
@@ -24,14 +24,15 @@ public void Issue2951Test()
 		var buttonToClick = App.FindElements("btnChangeStatus").ElementAt(1);
 		buttonToClick.Click();
 
-		Assert.That(buttonToClick.GetText(), Is.EqualTo("B"));
+		var updatedButton = App.FindElements("btnChangeStatus").ElementAt(1);
+		Assert.That(updatedButton.GetText(), Is.EqualTo("B"));
 
-		buttonToClick.Click();
+		updatedButton.Click();
 		var updatedButtonCount = App.FindElements("btnChangeStatus").Count();
 		Assert.That(updatedButtonCount, Is.EqualTo(2));
 
-		buttonToClick = App.FindElements("btnChangeStatus").ElementAt(1);
-		buttonToClick.Click();
+		var newSecondButton = App.FindElements("btnChangeStatus").ElementAt(1);
+		newSecondButton.Click();
 
 		// Use VerifyScreenshot to ensure the button background color has been updated properly
 		// This screenshot is captured to visually confirm that the background color has changed as expected
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_GalleryUITest.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_GalleryUITest.cs
new file mode 100644
index 000000000000..b840c3a830b7
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_GalleryUITest.cs
@@ -0,0 +1,62 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests
+{
+    public abstract class _GalleryUITest : UITest
+    {
+        public _GalleryUITest(TestDevice device) : base(device) { }
+
+        public override IConfig GetTestConfig()
+        {
+            var config = base.GetTestConfig();
+
+#if MACCATALYST
+            // For Catalyst, pass the test name as a startup argument
+            // If the UITestContext is not null we can directly pass the Issue via LaunchAppWithTest
+            if (UITestContext is null)
+            {
+                config.SetTestConfigurationArg("test", GalleryPageName);
+            }
+#endif
+
+            return config;
+        }
+
+        public override void LaunchAppWithTest()
+        {
+            const int maxRetries = 3;
+            const int delayBetweenRetries = 2000; // 2 seconds
+            
+            for (int attempt = 1; attempt <= maxRetries; attempt++)
+            {
+                try
+                {
+                    App.LaunchApp(GalleryPageName, ResetAfterEachTest);
+                    return; // Success, exit retry loop
+                }
+                catch (Exception)
+                {
+                    if (attempt == maxRetries)
+                    {
+                        TestContext.WriteLine($"Failed to launch app after {maxRetries} attempts.");
+                        throw; // Final attempt failed, rethrow the original exception
+                    }
+                    
+                    // Wait before retrying
+                    System.Threading.Thread.Sleep(delayBetweenRetries);
+                }
+            }
+        }
+
+        protected override void FixtureSetup()
+        {
+            base.FixtureSetup();
+            if (Device is not TestDevice.Mac)
+                App.NavigateToGallery(GalleryPageName);
+        }
+
+        public abstract string GalleryPageName { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs
index 55b4fcd2d0f6..91d5c0f7cd15 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs
@@ -21,7 +21,30 @@ public _IssuesUITest(TestDevice device) : base(device) { }
 
 		protected override void TryToResetTestState()
 		{
+#if !MACCATALYST
 			NavigateToIssue(Issue);
+#endif
+		}
+
+		public override IConfig GetTestConfig()
+		{
+			var config = base.GetTestConfig();
+
+#if MACCATALYST
+			// For Catalyst, pass the test name as a startup argument
+			// If the UITestContext is not null we can directly pass the Issue via LaunchAppWithTest
+			if (UITestContext is null)
+			{
+				config.SetTestConfigurationArg("test", Issue);
+			}
+#endif
+
+			return config;
+		}
+
+		public override void LaunchAppWithTest()
+		{
+			App.LaunchApp(Issue, ResetAfterEachTest);
 		}
 
 		public abstract string Issue { get; }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs
index a00f1bd5382b..23cd1fa1f773 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs
@@ -7,6 +7,8 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class KeyboardScrollingGridTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Grid with Star Row";
+
+		public override string GalleryPageName => KeyboardScrollingGallery;
 		
 		public KeyboardScrollingGridTests(TestDevice device)
 			: base(device)
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs
index 5c2b7e030734..824e41c60663 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs
@@ -8,6 +8,9 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class KeyboardScrollingNonScrollingPageLargeTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles";
+		
+		public override string GalleryPageName => KeyboardScrollingGallery;
+
 		public KeyboardScrollingNonScrollingPageLargeTitlesTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs
index e1798c870f5b..cbe20051b51f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs
@@ -7,6 +7,9 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class KeyboardScrollingNonScrollingPageSmallTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles";
+
+		public override string GalleryPageName => KeyboardScrollingGallery;
+		
 		public KeyboardScrollingNonScrollingPageSmallTitlesTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs
index 86759d6bd6b0..55a762fb089a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs
@@ -7,6 +7,9 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class KeyboardScrollingScrollingPageLargeTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Large Titles";
+
+		public override string GalleryPageName => KeyboardScrollingGallery;
+		
 		public KeyboardScrollingScrollingPageLargeTitlesTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs
index 750cbfa3f06d..6aee2bd34cc0 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs
@@ -7,6 +7,9 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class KeyboardScrollingScrollingPageSmallTitlesTests : CoreGalleryBasePageTest
 	{
 		const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Small Titles";
+
+		public override string GalleryPageName => KeyboardScrollingGallery;
+		
 		public KeyboardScrollingScrollingPageSmallTitlesTests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs
index 0b78392c7b6e..5a9a8b5d689d 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs
@@ -10,6 +10,8 @@ public class LabelUITests : _ViewUITests
 {
 	const string LabelGallery = "Label Gallery";
 
+	public override string GalleryPageName => LabelGallery;
+
 	public LabelUITests(TestDevice device)
 		: base(device)
 	{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/RadioButtonUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/RadioButtonUITests.cs
index 679301348732..637fc1d5f5ad 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/RadioButtonUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/RadioButtonUITests.cs
@@ -7,6 +7,8 @@ public class RadioButtonUITests : _ViewUITests
 	{
 		public const string RadioButtonGallery = "RadioButton Gallery";
 
+		public override string GalleryPageName => RadioButtonGallery;
+
 		public RadioButtonUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs
index d1bb5fd059a0..a4d5fb65fda3 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs
@@ -8,6 +8,8 @@ namespace Microsoft.Maui.TestCases.Tests
 	public class ScrollToUITests : CoreGalleryBasePageTest
 	{
 		const string LayoutGallery = "ScrollView Gallery";
+		public override string GalleryPageName => LayoutGallery;
+		
 		protected override bool ResetAfterEachTest => true;
 		public ScrollToUITests(TestDevice device)
 			: base(device)
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs
index f6246d091f36..b45e5cccfb1e 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs
@@ -9,6 +9,8 @@ public class SliderUITests : CoreGalleryBasePageTest
 	{
 		public const string SliderGallery = "Slider Gallery";
 
+		public override string GalleryPageName => SliderGallery;
+		
 		public SliderUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/StepperUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/StepperUITests.cs
index 23db7e3c1914..3f17e119777e 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/StepperUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/StepperUITests.cs
@@ -10,6 +10,8 @@ public class StepperUITests : CoreGalleryBasePageTest
 	{
 		public const string StepperGallery = "Stepper Gallery";
 
+		public override string GalleryPageName => StepperGallery;
+		
 		public StepperUITests(TestDevice device)
 			: base(device)
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs
index 74f539190e9d..b931e2c50327 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs
@@ -8,13 +8,13 @@ namespace Microsoft.Maui.TestCases.Tests
 {
 	public class SwipeViewUITests : CoreGalleryBasePageTest
 	{
-		const string ScrollViewGallery = "SwipeView Gallery";
+		const string SwipeViewGallery = "SwipeView Gallery";
 
 		const string SwipeViewToRightId = "SwipeViewToRightId";
 		const string ResultToRightId = "ResultToRightId";
 		const string SwipeViewToLeftId = "SwipeViewToLeftId";
 		const string ResultToLeftId = "ResultToLeftId";
-
+		public override string GalleryPageName => SwipeViewGallery;
 		public SwipeViewUITests(TestDevice device)
 			: base(device)
 		{
@@ -22,7 +22,7 @@ public SwipeViewUITests(TestDevice device)
 
 		protected override void NavigateToGallery()
 		{
-			App.NavigateToGallery(ScrollViewGallery);
+			App.NavigateToGallery(SwipeViewGallery);
 		}
 
 		[Test]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/UITest.cs b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
index ef0cc5e5c711..b2821aac5d90 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
@@ -110,6 +110,16 @@ public override void Reset()
 			App.ResetApp();
 		}
 
+		public override void Close()
+		{
+			App.CloseApp();
+		}
+
+		public override void LaunchAppWithTest()
+		{
+			App.LaunchApp();
+		}
+		
 		/// <summary>
 		/// Verifies the screenshots and returns an exception in case of failure.
 		/// </summary>
diff --git a/src/Controls/tests/TestCases.Shared.Tests/UtilExtensions.cs b/src/Controls/tests/TestCases.Shared.Tests/UtilExtensions.cs
index 01fa9571fbb9..50c6c3562169 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/UtilExtensions.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/UtilExtensions.cs
@@ -31,8 +31,12 @@ public static void Back(this UITestContextBase testBase)
 
 		public static void NavigateToGallery(this IApp app, string page)
 		{
-			app.WaitForElement(goToTestButtonId, "Timed out waiting for Go To Test button to appear", TimeSpan.FromMinutes(2));
-			NavigateTo(app, page);
+			// For Catalyst app directly go the test page while opening.
+			if (app is not AppiumCatalystApp)
+			{
+				app.WaitForElement(goToTestButtonId, "Timed out waiting for Go To Test button to appear", TimeSpan.FromMinutes(2));
+				NavigateTo(app, page);
+			}
 		}
 
 		public static void NavigateTo(this IApp app, string text)
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Bugzilla53834Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Bugzilla53834Test.png
index ad5430775a36..80002ead7ab0 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Bugzilla53834Test.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Bugzilla53834Test.png differ
diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
index 038e423d7c77..c754901a0f20 100644
--- a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
+++ b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
@@ -58,10 +58,18 @@ CommandResponse LaunchApp(IDictionary<string, object> parameters)
 				return CommandResponse.FailedEmptyResponse;
 
 			if (_app.GetTestDevice() == TestDevice.Mac)
-			{
-				_app.Driver.ExecuteScript("macos: activateApp", new Dictionary<string, object>
+			{		
+				var args = _app.Config.GetProperty<Dictionary<string, string>>("TestConfigurationArgs") ?? new Dictionary<string, string>();
+
+				if (args.ContainsKey("test") && parameters.ContainsKey("testName") && parameters["testName"] is string testName && !string.IsNullOrEmpty(testName))
+				{
+					args["test"] = testName;
+				}
+
+				_app.Driver.ExecuteScript("macos: launchApp", new Dictionary<string, object>
 				{
 					{ "bundleId", _app.GetAppId() },
+					{ "environment", args},
 				});
 			}
 			else if (_app.Driver is WindowsDriver windowsDriver)
diff --git a/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs b/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
index c6552ab90975..8e198e70448e 100644
--- a/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
+++ b/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
@@ -65,6 +65,12 @@ private static AppiumOptions GetOptions(IConfig config)
 				options.AddAdditionalAppiumOption(IOSMobileCapabilityType.BundleId, appId);
 			}
 
+			var args = config.GetProperty<Dictionary<string, string>>("TestConfigurationArgs");
+			if(args is not null && args.Count > 0)
+			{
+				options.AddAdditionalAppiumOption("environment", args);
+			}
+			
 			options.AddAdditionalAppiumOption("showServerLogs", true);
 			return options;
 		}
diff --git a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
index f11f2ef8fd35..2f5c62d15e59 100644
--- a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
+++ b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
@@ -1554,6 +1554,21 @@ public static void LaunchApp(this IApp app)
 			app.CommandExecutor.Execute("launchApp", ImmutableDictionary<string, object>.Empty);
 		}
 
+		/// <summary>
+		/// Executes an existing application on the device with additional parameters.
+		/// If the application is already running then it will be brought to the foreground.
+		/// </summary>
+		/// <param name="app">Represents the main gateway to interact with an app.</param>
+		/// <param name="parameters">Additional parameters to send with the launch command.</param>
+		public static void LaunchApp(this IApp app, string parameters, bool isResetAfterEachTest = false)
+		{
+			app.CommandExecutor.Execute("launchApp", new Dictionary<string, object>
+			{
+				{ "testName", parameters },
+				{ "isResetAfterEachTest", isResetAfterEachTest }
+			});
+		}
+		
 		/// <summary>
 		/// Send the currently running app for this session to the background.
 		/// </summary>
diff --git a/src/TestUtils/src/UITest.NUnit/UITestBase.cs b/src/TestUtils/src/UITest.NUnit/UITestBase.cs
index 494a5243c9b1..5206e2c7878d 100644
--- a/src/TestUtils/src/UITest.NUnit/UITestBase.cs
+++ b/src/TestUtils/src/UITest.NUnit/UITestBase.cs
@@ -58,8 +58,17 @@ protected virtual void FixtureOneTimeTearDown()
 		{
 			try
 			{
-				if (!ResetAfterEachTest)
+				
+				if (Device is TestDevice.Mac)
+				{
+					// For Mac, here needed to close the app itself, re-open happens on InitialSetup
+					Close();
+				}
+				else if (!ResetAfterEachTest)
+				{
 					Reset();
+				}
+					 
 			}
 			catch (Exception e)
 			{
diff --git a/src/TestUtils/src/UITest.NUnit/UITestContextBase.cs b/src/TestUtils/src/UITest.NUnit/UITestContextBase.cs
index 58894a0da342..bc9b159a0a1a 100644
--- a/src/TestUtils/src/UITest.NUnit/UITestContextBase.cs
+++ b/src/TestUtils/src/UITest.NUnit/UITestContextBase.cs
@@ -38,10 +38,20 @@ public IApp App
 		public IApp RunningApp => App;
 
 		public abstract IConfig GetTestConfig();
+		
+		public abstract void Close();
+
+		public abstract void LaunchAppWithTest();
 
 		public void InitialSetup(IServerContext context)
 		{
 			_context = context ?? throw new ArgumentNullException(nameof(context));
+
+			if (UITestContext != null && Device is TestDevice.Mac)
+			{
+				LaunchAppWithTest();
+			}
+
 			InitialSetup(context, false);
 		}