diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TextInEditorShouldScroll.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TextInEditorShouldScroll.png
index 160d4dba5acc..62f0cc6010fd 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TextInEditorShouldScroll.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TextInEditorShouldScroll.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19500.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19500.cs
index d3adf44e6fc0..6dbda190aa60 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19500.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19500.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -19,6 +19,11 @@ public void TextInEditorShouldScroll()
 			_ = App.WaitForElement("editor");
 			App.ScrollDown("editor");
 
+#if MACCATALYST // In Catalyst scroll down is not effective so here we retry one more time to address the flakyness.
+			Thread.Sleep(500);
+			App.ScrollDown("editor");
+#endif
+
 			// The test passes if the text inside the editor scrolls down
 			VerifyScreenshot();
 		}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs
index aa5c25fd9de9..cafd3d06f605 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs
@@ -27,7 +27,12 @@ public void VerifyEntryClearButtonVisibilitySetToWhileEditing()
 				App.DismissKeyboard();
 			}
 #endif
+
+#if IOS //Inconsistent keyboard visibility issue in iOS CI environments can cause test flakiness. As this test validate the clear button visibility only, so the keyboard is not mandatory.
+			VerifyScreenshot(cropBottom: 1200);
+#else
 			VerifyScreenshot();
+#endif
 		}
 
 		[Test]
@@ -45,7 +50,12 @@ public void VerifyEntryClearButtonVisibilitySetToNever()
 				App.DismissKeyboard();
 			}
 #endif
+
+#if IOS //Inconsistent keyboard visibility issue in iOS CI environments can cause test flakiness. As this test validate the clear button visibility only, so the keyboard is not mandatory.
+			VerifyScreenshot(cropBottom: 1200);
+#else
 			VerifyScreenshot();
+#endif
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToNever.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToNever.png
index 71c772708a31..a1d620753039 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToNever.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToNever.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToWhileEditing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToWhileEditing.png
index 9e8b8c4c6bbe..7406b8ebd440 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToWhileEditing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryClearButtonVisibilitySetToWhileEditing.png differ