diff --git a/test/integration/ios-simulator-e2e/live-runner.ts b/test/integration/ios-simulator-e2e/live-runner.ts
index 7f4511f423..d01b2f1025 100644
--- a/test/integration/ios-simulator-e2e/live-runner.ts
+++ b/test/integration/ios-simulator-e2e/live-runner.ts
@@ -10,6 +10,7 @@ import { assertPngFile } from '../provider-scenarios/assertions.ts';
 import {
   assertFilesDiffer,
   assertJsonContains,
+  assertWaitSelector,
   assertWaitText,
   capturePng,
   requireNodeRect,
@@ -344,6 +345,7 @@ async function assertFormInput(context: LiveContext): Promise<void> {
     String(emailRect.x + emailRect.width / 2),
     String(emailRect.y + emailRect.height / 2),
   ]);
+  await assertWaitSelector(context, 'role="keyboard" visible=true', { debug: true });
   const typedSuffix = await runStep(context, 'append email suffix from coordinate focus', [
     'type',
     '.test',
diff --git a/test/integration/replays/android/emulator/04-text-input-keyboard.ad b/test/integration/replays/android/emulator/04-text-input-keyboard.ad
index 4dbdc1c01c..360704ae75 100644
--- a/test/integration/replays/android/emulator/04-text-input-keyboard.ad
+++ b/test/integration/replays/android/emulator/04-text-input-keyboard.ad
@@ -4,14 +4,18 @@ context platform=android
 open settings --relaunch
 snapshot -i
 
-click @e2
-wait 1000
+click 'text="Search Settings"'
+wait 'role=text-field focused=true' 5000
+is focused 'role=text-field'
+screenshot "./test/screenshots/replays/android-search-focused.png"
 snapshot -i
 
 keyboard status
 
 type "Display"
-wait 1000
+wait 'role=text-field value="Display"' 5000
+is focused 'role=text-field value="Display"'
+screenshot "./test/screenshots/replays/android-search-typed.png"
 snapshot -i
 
 screenshot "./test/screenshots/replays/android-search-results.png"
diff --git a/test/integration/replays/ios/simulator/03-scroll-discovery.ad b/test/integration/replays/ios/simulator/03-scroll-discovery.ad
index 2646c29e9b..0f71a36cc0 100644
--- a/test/integration/replays/ios/simulator/03-scroll-discovery.ad
+++ b/test/integration/replays/ios/simulator/03-scroll-discovery.ad
@@ -2,10 +2,11 @@
 context platform=ios target=mobile
 
 open com.apple.Preferences --relaunch
-scroll down 3
-wait 500
-find text "Accessibility" exists
+is visible 'role=button label=General'
+is absent 'role=button label=Apps'
+scroll down --until 'role=button label=Apps'
+is visible 'role=button label=Apps'
 
-scroll up 3
-wait 500
-find text "General" exists
+is absent 'role=button label=General'
+scroll up --until 'role=button label=General'
+is visible 'role=button label=General'
diff --git a/test/integration/replays/ios/simulator/04-text-input-keyboard.ad b/test/integration/replays/ios/simulator/04-text-input-keyboard.ad
index a9f04c26d8..5740a652af 100644
--- a/test/integration/replays/ios/simulator/04-text-input-keyboard.ad
+++ b/test/integration/replays/ios/simulator/04-text-input-keyboard.ad
@@ -3,9 +3,12 @@ context platform=ios target=mobile
 
 open com.apple.Preferences --relaunch
 click "role=searchField || label=Search || label=\"Search\""
-wait 1000
+wait 'editable=true focused=true'
+is focused 'editable=true'
 
 type "General"
-wait 1000
+wait 'editable=true value="General"'
+is focused 'editable=true value="General"'
+screenshot "./test/screenshots/replays/ios-search-results.png"
 
 find text "General" exists