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 284b44f892a4..4837cbba4e88 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/DatePickerFeatureTests.cs
@@ -19,6 +19,7 @@ protected override void 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
 	[Test, Order(1)]
 	[Category(UITestCategories.DatePicker)]
 	public void DatePicker_InitialState_VerifyVisualState()
@@ -85,8 +86,9 @@ public void DatePicker_OldDateAndNewDate_VerifyVisualState()
 #endif
 		VerifyScreenshot();
 	}
+#endif
 
-#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/30066
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_IOS // Issue Links - https://github.com/dotnet/maui/issues/30066, https://github.com/dotnet/maui/issues/31167
 	[Test, Order(4)]
 	[Category(UITestCategories.DatePicker)]
 	public void DatePicker_SetCharacterSpacingAndDate_VerifyVisualState()
@@ -143,7 +145,7 @@ public void DatePicker_SetDateAndFormat_VerifyVisualState()
 	}
 #endif
 
-#if TEST_FAILS_ON_CATALYST // Issue Links -https://github.com/dotnet/maui/issues/20904
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Links -https://github.com/dotnet/maui/issues/20904, https://github.com/dotnet/maui/issues/31167
 	[Test, Order(7)]
 	[Category(UITestCategories.DatePicker)]
 	public void DatePicker_SetDateAndTextColor_VerifyVisualState()
@@ -175,7 +177,7 @@ public void DatePicker_SetDateAndFlowDirection_VerifyVisualState()
 	}
 #endif
 
-#if TEST_FAILS_ON_CATALYST
+#if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Link: https://github.com/dotnet/maui/issues/31167
 	[Test, Order(9)]
 	[Category(UITestCategories.DatePicker)]
 	public void DatePicker_SetFontAttributesAndFontFamily_VerifyVisualState()
@@ -191,9 +193,7 @@ public void DatePicker_SetFontAttributesAndFontFamily_VerifyVisualState()
 		App.WaitForElementTillPageNavigationSettled("DatePickerControl");
 		VerifyScreenshot();
 	}
-#endif
-
-#if TEST_FAILS_ON_CATALYST
+ 
 	[Test, Order(10)]
 	[Category(UITestCategories.DatePicker)]
 	public void DatePicker_SetFontAttributesAndFontSize_VerifyVisualState()
@@ -210,6 +210,23 @@ public void DatePicker_SetFontAttributesAndFontSize_VerifyVisualState()
 		App.WaitForElementTillPageNavigationSettled("DatePickerControl");
 		VerifyScreenshot();
 	}
+	
+	[Test, Order(12)]
+	[Category(UITestCategories.DatePicker)]
+	public void DatePicker_SetFontFamilyAndFontSize_VerifyVisualState()
+	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("FontFamilyDokdoButton");
+		App.Tap("FontFamilyDokdoButton");
+		App.WaitForElement("FontSizeEntry");
+		App.ClearText("FontSizeEntry");
+		App.EnterText("FontSizeEntry", "20");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElementTillPageNavigationSettled("DatePickerControl");
+		VerifyScreenshot();
+	}
 #endif
 
 #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/23793, https://github.com/dotnet/maui/issues/29099, https://github.com/dotnet/maui/issues/30011
@@ -233,25 +250,6 @@ public void DatePicker_SetFontAttributesAndFormat_VerifyVisualState()
 	}
 #endif
 
-#if TEST_FAILS_ON_CATALYST
-	[Test, Order(12)]
-	[Category(UITestCategories.DatePicker)]
-	public void DatePicker_SetFontFamilyAndFontSize_VerifyVisualState()
-	{
-		App.WaitForElement("Options");
-		App.Tap("Options");
-		App.WaitForElement("FontFamilyDokdoButton");
-		App.Tap("FontFamilyDokdoButton");
-		App.WaitForElement("FontSizeEntry");
-		App.ClearText("FontSizeEntry");
-		App.EnterText("FontSizeEntry", "20");
-		App.WaitForElement("Apply");
-		App.Tap("Apply");
-		App.WaitForElementTillPageNavigationSettled("DatePickerControl");
-		VerifyScreenshot();
-	}
-#endif
-
 #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/23793, https://github.com/dotnet/maui/issues/29099, https://github.com/dotnet/maui/issues/30011
 	[Test, Order(13)]
 	[Category(UITestCategories.DatePicker)]
@@ -297,6 +295,7 @@ public void DatePicker_SetFontSizeAndFormat_VerifyVisualState()
 	}
 #endif
 
+#if TEST_FAILS_ON_IOS //Issue Link: https://github.com/dotnet/maui/issues/31167
 	[Test, Order(15)]
 	[Category(UITestCategories.DatePicker)]
 	public void DatePicker_SetDateAndIsEnabled_VerifyVisualState()
@@ -312,6 +311,7 @@ public void DatePicker_SetDateAndIsEnabled_VerifyVisualState()
 		App.Tap("DatePickerControl");
 		VerifyScreenshot();
 	}
+#endif
 
 	[Test, Order(16)]
 	[Category(UITestCategories.DatePicker)]
@@ -327,7 +327,7 @@ public void DatePicker_SetDateAndIsVisible_VerifyVisualState()
 		VerifyScreenshot();
 	}
 
-#if TEST_FAILS_ON_WINDOWS // Issue Links - https://github.com/dotnet/maui/issues/29812
+#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_IOS// Issue Links - https://github.com/dotnet/maui/issues/29812, https://github.com/dotnet/maui/issues/31167
 	[Test, Order(17)]
 	[Category(UITestCategories.DatePicker)]
 	public void DatePicker_SetDateAndShadowOpacity_VerifyVisualState()
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 c2071396bfd7..7bff08acdb06 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/GraphicsViewFeatureTests.cs
@@ -132,6 +132,7 @@ public void GraphicsView_StringDrawable_VerifyTypeAndRendering()
 		VerifyShapeScreenshot();
 	}
 
+#if TEST_FAILS_ON_ANDROID // Issue Link: https://github.com/dotnet/maui/issues/30783
 	[Test]
 	[Category(UITestCategories.GraphicsView)]
 	public void GraphicsView_ImageDrawable_VerifyTypeAndRendering()
@@ -147,6 +148,7 @@ public void GraphicsView_ImageDrawable_VerifyTypeAndRendering()
 		Assert.That(App.FindElement("DrawableTypeLabel").GetText(), Is.EqualTo("Image"));
 		VerifyShapeScreenshot();
 	}
+#endif
 
 #if TEST_FAILS_ON_ANDROID  //See issue : https://github.com/dotnet/maui/issues/29394                                                            
 	[Test]
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs
index 9e8ce2b335ad..72f1bf3fb05f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18430.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_ANDROID // https://github.com/dotnet/maui/issues/30783
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -19,3 +20,4 @@ public void Issue18430ExceptionShouldNotThrown()
 		App.WaitForElement("Issue18430DescriptionLabel");
 	}
 }
+#endif
\ No newline at end of file