diff --git a/packages/rn-tester/.maestro/scrollview-minindex-maintainvisible.yml b/packages/rn-tester/.maestro/scrollview-minindex-maintainvisible.yml
index 0925eda988fe..7c36f0f5ad76 100644
--- a/packages/rn-tester/.maestro/scrollview-minindex-maintainvisible.yml
+++ b/packages/rn-tester/.maestro/scrollview-minindex-maintainvisible.yml
@@ -3,21 +3,17 @@
 appId: ${APP_ID}
 ---
 - launchApp
+- stopApp
+- openLink: rntester://example/ScrollViewMaintainVisibleContentPositionExample
+- runFlow: ./helpers/confirm-open-link.yml
 # Change to portrait
 - setOrientation: portrait
 - waitForAnimationToEnd:
     timeout: 3000
-# Find test
-- assertVisible: 'Components'
-- scrollUntilVisible:
-    element:
-      id: 'ScrollViewMaintainVisibleContentPositionExample'
-    direction: DOWN
-    speed: 80
-- tapOn:
-    id: 'ScrollViewMaintainVisibleContentPositionExample'
-- waitForAnimationToEnd:
-    timeout: 2000
+- extendedWaitUntil:
+    visible:
+      id: 'scroll-offset-display'
+    timeout: 120000
 # Set minIndexForVisible to 0
 - tapOn:
     text: 'minIndex: 0'
diff --git a/packages/rn-tester/.maestro/scrollview-threshold-maintainvisible.yml b/packages/rn-tester/.maestro/scrollview-threshold-maintainvisible.yml
index c865c3cb26e9..f270261af945 100644
--- a/packages/rn-tester/.maestro/scrollview-threshold-maintainvisible.yml
+++ b/packages/rn-tester/.maestro/scrollview-threshold-maintainvisible.yml
@@ -3,21 +3,17 @@
 appId: ${APP_ID}
 ---
 - launchApp
+- stopApp
+- openLink: rntester://example/ScrollViewMaintainVisibleContentPositionExample
+- runFlow: ./helpers/confirm-open-link.yml
 # Change to portrait
 - setOrientation: portrait
 - waitForAnimationToEnd:
     timeout: 3000
-# Find test
-- assertVisible: 'Components'
-- scrollUntilVisible:
-    element:
-      id: 'ScrollViewMaintainVisibleContentPositionExample'
-    direction: DOWN
-    speed: 80
-- tapOn:
-    id: 'ScrollViewMaintainVisibleContentPositionExample'
-- waitForAnimationToEnd:
-    timeout: 2000
+- extendedWaitUntil:
+    visible:
+      id: 'scroll-offset-display'
+    timeout: 120000
 # Disable threshold
 - tapOn:
     text: 'Threshold: OFF'