From 80aaff2f08466b338b52285c9e22eec5f5286108 Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 12:49:00 -0700
Subject: [PATCH 01/10] test: allow slower Android startup in CI

---
 .github/workflows/e2e.yml            | 28 ++++++++++++++++++++++------
 tests/e2e/flows/layout_screen.yaml   |  2 +-
 tests/e2e/flows/list_screen.yaml     |  2 +-
 tests/e2e/flows/main.yaml            |  2 +-
 tests/e2e/flows/navigation.yaml      |  2 +-
 tests/e2e/flows/settings_screen.yaml |  2 +-
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 00623a4..f9b905f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -40,12 +40,28 @@ jobs:
         with:
           api-level: 31
           arch: x86_64
-          script: >-
-            cd examples/hello-world &&
-            pn run android --no-logs &&
-            sleep 5 &&
-            cd ../.. &&
-            maestro test tests/e2e/android.yaml
+          script: |
+            export MAESTRO_CLI_NO_ANALYTICS=1
+            cd examples/hello-world
+            pn run android --no-logs
+            cd ../..
+            maestro test tests/e2e/android.yaml || {
+              status=$?
+              adb devices || true
+              adb shell dumpsys window | grep -E 'mCurrentFocus|mFocusedApp' || true
+              adb shell dumpsys activity top | head -120 || true
+              adb shell uiautomator dump /sdcard/window.xml || true
+              adb shell cat /sdcard/window.xml || true
+              adb logcat -d -t 1000 PythonNative:D MainActivity:D ScreenFragment:D python.stdout:I python.stderr:E AndroidRuntime:E '*:S' || true
+              exit "$status"
+            }
+
+      - name: Upload Android E2E debug artifacts
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-e2e-debug
+          path: ~/.maestro/tests
 
   e2e-ios:
     runs-on: macos-latest
diff --git a/tests/e2e/flows/layout_screen.yaml b/tests/e2e/flows/layout_screen.yaml
index bcbb51a..ba47a36 100644
--- a/tests/e2e/flows/layout_screen.yaml
+++ b/tests/e2e/flows/layout_screen.yaml
@@ -5,7 +5,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 30000
+    timeout: 120000
 - tapOn: "Layout"
 - extendedWaitUntil:
     visible: "Flex layout"
diff --git a/tests/e2e/flows/list_screen.yaml b/tests/e2e/flows/list_screen.yaml
index a2ee814..798f619 100644
--- a/tests/e2e/flows/list_screen.yaml
+++ b/tests/e2e/flows/list_screen.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 30000
+    timeout: 120000
 - tapOn: "List"
 - extendedWaitUntil:
     visible: "Row 1"
diff --git a/tests/e2e/flows/main.yaml b/tests/e2e/flows/main.yaml
index 62c04b6..cd74cea 100644
--- a/tests/e2e/flows/main.yaml
+++ b/tests/e2e/flows/main.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 30000
+    timeout: 120000
 - assertVisible: "Tapped 0 times"
 - assertVisible: "Tap me"
 - assertVisible: "View Showcase"
diff --git a/tests/e2e/flows/navigation.yaml b/tests/e2e/flows/navigation.yaml
index 6d14ffd..e5fff72 100644
--- a/tests/e2e/flows/navigation.yaml
+++ b/tests/e2e/flows/navigation.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 30000
+    timeout: 120000
 - tapOn: "View Showcase"
 - assertVisible: "Greetings from Home"
 - assertVisible: "View Forms"
diff --git a/tests/e2e/flows/settings_screen.yaml b/tests/e2e/flows/settings_screen.yaml
index 51792aa..e400b39 100644
--- a/tests/e2e/flows/settings_screen.yaml
+++ b/tests/e2e/flows/settings_screen.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 30000
+    timeout: 120000
 - tapOn: "Settings"
 - extendedWaitUntil:
     visible: "Settings"

From 7d049aede75abfd9a0a38b80407b758b24520d3a Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 13:54:58 -0700
Subject: [PATCH 02/10] test: run Android E2E through a CI script

---
 .github/workflows/e2e.yml     | 16 +--------------
 scripts/run-android-e2e-ci.sh | 38 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 scripts/run-android-e2e-ci.sh

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index f9b905f..20d591a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -40,21 +40,7 @@ jobs:
         with:
           api-level: 31
           arch: x86_64
-          script: |
-            export MAESTRO_CLI_NO_ANALYTICS=1
-            cd examples/hello-world
-            pn run android --no-logs
-            cd ../..
-            maestro test tests/e2e/android.yaml || {
-              status=$?
-              adb devices || true
-              adb shell dumpsys window | grep -E 'mCurrentFocus|mFocusedApp' || true
-              adb shell dumpsys activity top | head -120 || true
-              adb shell uiautomator dump /sdcard/window.xml || true
-              adb shell cat /sdcard/window.xml || true
-              adb logcat -d -t 1000 PythonNative:D MainActivity:D ScreenFragment:D python.stdout:I python.stderr:E AndroidRuntime:E '*:S' || true
-              exit "$status"
-            }
+          script: bash scripts/run-android-e2e-ci.sh
 
       - name: Upload Android E2E debug artifacts
         if: failure()
diff --git a/scripts/run-android-e2e-ci.sh b/scripts/run-android-e2e-ci.sh
new file mode 100644
index 0000000..818d529
--- /dev/null
+++ b/scripts/run-android-e2e-ci.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Build the hello-world Android app and run Maestro E2E tests in CI.
+
+set -Eeuo pipefail
+
+dump_android_debug() {
+  local status=$?
+  trap - ERR
+  set +e
+
+  echo "::group::Android E2E debug"
+  adb devices
+  adb shell dumpsys window | grep -E "mCurrentFocus|mFocusedApp" || true
+  adb shell dumpsys activity top | sed -n "1,120p" || true
+  adb shell uiautomator dump /sdcard/window.xml || true
+  adb shell cat /sdcard/window.xml || true
+  adb logcat -d -t 1000 \
+    PythonNative:D \
+    MainActivity:D \
+    ScreenFragment:D \
+    python.stdout:I \
+    python.stderr:E \
+    AndroidRuntime:E \
+    '*:S' || true
+  echo "::endgroup::"
+
+  exit "$status"
+}
+
+trap dump_android_debug ERR
+
+export MAESTRO_CLI_NO_ANALYTICS=1
+
+cd examples/hello-world
+pn run android --no-logs
+
+cd ../..
+maestro test tests/e2e/android.yaml

From 23abb7849f6c3e78e90a47bf1ec5f738516004b9 Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 14:14:48 -0700
Subject: [PATCH 03/10] ci(workflows): enable KVM for Android E2E emulator

---
 .github/workflows/e2e.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 20d591a..9e420ed 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -35,6 +35,12 @@ jobs:
           curl -Ls "https://get.maestro.mobile.dev" | bash
           echo "$HOME/.maestro/bin" >> $GITHUB_PATH
 
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: Build, install, and run E2E tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

From facb3cde9833cc7eeccc9313d13d1296a3114bcb Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 15:09:35 -0700
Subject: [PATCH 04/10] test: scroll to navigation controls on small Android
 screens

---
 tests/e2e/flows/navigation.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/flows/navigation.yaml b/tests/e2e/flows/navigation.yaml
index e5fff72..1beeac1 100644
--- a/tests/e2e/flows/navigation.yaml
+++ b/tests/e2e/flows/navigation.yaml
@@ -7,13 +7,22 @@ appId: ${APP_ID}
     timeout: 120000
 - tapOn: "View Showcase"
 - assertVisible: "Greetings from Home"
-- assertVisible: "View Forms"
-- assertVisible: "Back"
+- scroll
+- extendedWaitUntil:
+    visible: "View Forms"
+    timeout: 10000
+- extendedWaitUntil:
+    visible: "Back"
+    timeout: 10000
 - tapOn: "View Forms"
 - assertVisible: "Forms"
 - assertVisible: "You navigated two levels deep."
 - assertVisible: "Back to Showcase"
 - tapOn: "Back to Showcase"
 - assertVisible: "Greetings from Home"
+- scroll
+- extendedWaitUntil:
+    visible: "Back"
+    timeout: 10000
 - tapOn: "Back"
 - assertVisible: "Hello from PythonNative Demo!"

From 18c7d8e11922e0bae51636f4a1ab98bffd1f20fd Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 15:25:35 -0700
Subject: [PATCH 05/10] test: scroll further to reach showcase buttons on
 Android

---
 tests/e2e/flows/navigation.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/e2e/flows/navigation.yaml b/tests/e2e/flows/navigation.yaml
index 1beeac1..f1893a1 100644
--- a/tests/e2e/flows/navigation.yaml
+++ b/tests/e2e/flows/navigation.yaml
@@ -8,6 +8,7 @@ appId: ${APP_ID}
 - tapOn: "View Showcase"
 - assertVisible: "Greetings from Home"
 - scroll
+- scroll
 - extendedWaitUntil:
     visible: "View Forms"
     timeout: 10000
@@ -21,6 +22,7 @@ appId: ${APP_ID}
 - tapOn: "Back to Showcase"
 - assertVisible: "Greetings from Home"
 - scroll
+- scroll
 - extendedWaitUntil:
     visible: "Back"
     timeout: 10000

From 5db38dd5ed34a0c3a4308e5e395e46b298d64dea Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 15:54:10 -0700
Subject: [PATCH 06/10] test: avoid offscreen showcase back button in
 navigation flow

---
 tests/e2e/flows/navigation.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/e2e/flows/navigation.yaml b/tests/e2e/flows/navigation.yaml
index f1893a1..ff949ee 100644
--- a/tests/e2e/flows/navigation.yaml
+++ b/tests/e2e/flows/navigation.yaml
@@ -12,19 +12,9 @@ appId: ${APP_ID}
 - extendedWaitUntil:
     visible: "View Forms"
     timeout: 10000
-- extendedWaitUntil:
-    visible: "Back"
-    timeout: 10000
 - tapOn: "View Forms"
 - assertVisible: "Forms"
 - assertVisible: "You navigated two levels deep."
 - assertVisible: "Back to Showcase"
 - tapOn: "Back to Showcase"
 - assertVisible: "Greetings from Home"
-- scroll
-- scroll
-- extendedWaitUntil:
-    visible: "Back"
-    timeout: 10000
-- tapOn: "Back"
-- assertVisible: "Hello from PythonNative Demo!"

From bcf4def88062268e919ff0f417a5921651933c53 Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 16:10:27 -0700
Subject: [PATCH 07/10] test: scroll to Forms back button on Android

---
 tests/e2e/flows/navigation.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/flows/navigation.yaml b/tests/e2e/flows/navigation.yaml
index ff949ee..73bcfd3 100644
--- a/tests/e2e/flows/navigation.yaml
+++ b/tests/e2e/flows/navigation.yaml
@@ -15,6 +15,10 @@ appId: ${APP_ID}
 - tapOn: "View Forms"
 - assertVisible: "Forms"
 - assertVisible: "You navigated two levels deep."
-- assertVisible: "Back to Showcase"
+- scroll
+- scroll
+- extendedWaitUntil:
+    visible: "Back to Showcase"
+    timeout: 10000
 - tapOn: "Back to Showcase"
 - assertVisible: "Greetings from Home"

From 300ad54a715ee60ea596932bf3fa547c735aea08 Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 16:24:55 -0700
Subject: [PATCH 08/10] test(e2e): use Android back action in navigation flow

---
 tests/e2e/android.yaml                  |  2 +-
 tests/e2e/flows/navigation_android.yaml | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/e2e/flows/navigation_android.yaml

diff --git a/tests/e2e/android.yaml b/tests/e2e/android.yaml
index 41c36bd..4266e07 100644
--- a/tests/e2e/android.yaml
+++ b/tests/e2e/android.yaml
@@ -3,7 +3,7 @@ env:
   APP_ID: com.pythonnative.android_template
 ---
 - runFlow: flows/main.yaml
-- runFlow: flows/navigation.yaml
+- runFlow: flows/navigation_android.yaml
 - runFlow: flows/layout_screen.yaml
 - runFlow: flows/list_screen.yaml
 - runFlow: flows/settings_screen.yaml
diff --git a/tests/e2e/flows/navigation_android.yaml b/tests/e2e/flows/navigation_android.yaml
new file mode 100644
index 0000000..8bb491d
--- /dev/null
+++ b/tests/e2e/flows/navigation_android.yaml
@@ -0,0 +1,19 @@
+appId: ${APP_ID}
+---
+# Navigate Home -> Showcase -> Forms and back on Android.
+- launchApp
+- extendedWaitUntil:
+    visible: "Hello from PythonNative Demo!"
+    timeout: 120000
+- tapOn: "View Showcase"
+- assertVisible: "Greetings from Home"
+- scroll
+- scroll
+- extendedWaitUntil:
+    visible: "View Forms"
+    timeout: 10000
+- tapOn: "View Forms"
+- assertVisible: "Forms"
+- assertVisible: "You navigated two levels deep."
+- back
+- assertVisible: "Greetings from Home"

From 32badb930773e6004e9ef7f83b5dc59fb898feb3 Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 22:36:19 -0700
Subject: [PATCH 09/10] test: add Android-specific layout flow

---
 tests/e2e/android.yaml                  |  2 +-
 tests/e2e/flows/layout_android.yaml     | 17 +++++++++++++++++
 tests/e2e/flows/navigation_android.yaml |  8 ++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 tests/e2e/flows/layout_android.yaml

diff --git a/tests/e2e/android.yaml b/tests/e2e/android.yaml
index 4266e07..7f422cb 100644
--- a/tests/e2e/android.yaml
+++ b/tests/e2e/android.yaml
@@ -4,6 +4,6 @@ env:
 ---
 - runFlow: flows/main.yaml
 - runFlow: flows/navigation_android.yaml
-- runFlow: flows/layout_screen.yaml
+- runFlow: flows/layout_android.yaml
 - runFlow: flows/list_screen.yaml
 - runFlow: flows/settings_screen.yaml
diff --git a/tests/e2e/flows/layout_android.yaml b/tests/e2e/flows/layout_android.yaml
new file mode 100644
index 0000000..67f5cc9
--- /dev/null
+++ b/tests/e2e/flows/layout_android.yaml
@@ -0,0 +1,17 @@
+appId: ${APP_ID}
+---
+# Switch to the Layout screen and verify the parts that fit in the
+# 320x640 Android CI viewport.
+- launchApp
+- extendedWaitUntil:
+    visible: "Hello from PythonNative Demo!"
+    timeout: 120000
+- tapOn: "Layout"
+- extendedWaitUntil:
+    visible: "Flex layout"
+    timeout: 10000
+- assertVisible: "flex: 1"
+- assertVisible: "Aspect ratio"
+- assertVisible: "1:1"
+- assertVisible: "16:9"
+- assertVisible: "Absolute positioning"
diff --git a/tests/e2e/flows/navigation_android.yaml b/tests/e2e/flows/navigation_android.yaml
index 8bb491d..3ca0ee6 100644
--- a/tests/e2e/flows/navigation_android.yaml
+++ b/tests/e2e/flows/navigation_android.yaml
@@ -6,7 +6,9 @@ appId: ${APP_ID}
     visible: "Hello from PythonNative Demo!"
     timeout: 120000
 - tapOn: "View Showcase"
-- assertVisible: "Greetings from Home"
+- extendedWaitUntil:
+    visible: "Greetings from Home"
+    timeout: 10000
 - scroll
 - scroll
 - extendedWaitUntil:
@@ -16,4 +18,6 @@ appId: ${APP_ID}
 - assertVisible: "Forms"
 - assertVisible: "You navigated two levels deep."
 - back
-- assertVisible: "Greetings from Home"
+- extendedWaitUntil:
+    visible: "Greetings from Home"
+    timeout: 10000

From 5dd8a66d02257f401d3e24680b2b88fa1e474683 Mon Sep 17 00:00:00 2001
From: Owen Carey <37121709+owenthcarey@users.noreply.github.com>
Date: Tue, 19 May 2026 23:21:07 -0700
Subject: [PATCH 10/10] test: trim Android E2E fixes to essentials

---
 .github/workflows/e2e.yml               | 10 ++-----
 scripts/run-android-e2e-ci.sh           | 38 -------------------------
 tests/e2e/flows/layout_android.yaml     |  2 +-
 tests/e2e/flows/layout_screen.yaml      |  2 +-
 tests/e2e/flows/list_screen.yaml        |  2 +-
 tests/e2e/flows/main.yaml               |  2 +-
 tests/e2e/flows/navigation.yaml         | 17 ++++-------
 tests/e2e/flows/navigation_android.yaml |  2 +-
 tests/e2e/flows/settings_screen.yaml    |  2 +-
 9 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100644 scripts/run-android-e2e-ci.sh

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 9e420ed..fd72f06 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -46,14 +46,8 @@ jobs:
         with:
           api-level: 31
           arch: x86_64
-          script: bash scripts/run-android-e2e-ci.sh
-
-      - name: Upload Android E2E debug artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: android-e2e-debug
-          path: ~/.maestro/tests
+          script: >-
+            bash -lc "cd examples/hello-world && pn run android --no-logs && cd ../.. && maestro test tests/e2e/android.yaml"
 
   e2e-ios:
     runs-on: macos-latest
diff --git a/scripts/run-android-e2e-ci.sh b/scripts/run-android-e2e-ci.sh
deleted file mode 100644
index 818d529..0000000
--- a/scripts/run-android-e2e-ci.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-# Build the hello-world Android app and run Maestro E2E tests in CI.
-
-set -Eeuo pipefail
-
-dump_android_debug() {
-  local status=$?
-  trap - ERR
-  set +e
-
-  echo "::group::Android E2E debug"
-  adb devices
-  adb shell dumpsys window | grep -E "mCurrentFocus|mFocusedApp" || true
-  adb shell dumpsys activity top | sed -n "1,120p" || true
-  adb shell uiautomator dump /sdcard/window.xml || true
-  adb shell cat /sdcard/window.xml || true
-  adb logcat -d -t 1000 \
-    PythonNative:D \
-    MainActivity:D \
-    ScreenFragment:D \
-    python.stdout:I \
-    python.stderr:E \
-    AndroidRuntime:E \
-    '*:S' || true
-  echo "::endgroup::"
-
-  exit "$status"
-}
-
-trap dump_android_debug ERR
-
-export MAESTRO_CLI_NO_ANALYTICS=1
-
-cd examples/hello-world
-pn run android --no-logs
-
-cd ../..
-maestro test tests/e2e/android.yaml
diff --git a/tests/e2e/flows/layout_android.yaml b/tests/e2e/flows/layout_android.yaml
index 67f5cc9..652f88f 100644
--- a/tests/e2e/flows/layout_android.yaml
+++ b/tests/e2e/flows/layout_android.yaml
@@ -5,7 +5,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 120000
+    timeout: 30000
 - tapOn: "Layout"
 - extendedWaitUntil:
     visible: "Flex layout"
diff --git a/tests/e2e/flows/layout_screen.yaml b/tests/e2e/flows/layout_screen.yaml
index ba47a36..bcbb51a 100644
--- a/tests/e2e/flows/layout_screen.yaml
+++ b/tests/e2e/flows/layout_screen.yaml
@@ -5,7 +5,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 120000
+    timeout: 30000
 - tapOn: "Layout"
 - extendedWaitUntil:
     visible: "Flex layout"
diff --git a/tests/e2e/flows/list_screen.yaml b/tests/e2e/flows/list_screen.yaml
index 798f619..a2ee814 100644
--- a/tests/e2e/flows/list_screen.yaml
+++ b/tests/e2e/flows/list_screen.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 120000
+    timeout: 30000
 - tapOn: "List"
 - extendedWaitUntil:
     visible: "Row 1"
diff --git a/tests/e2e/flows/main.yaml b/tests/e2e/flows/main.yaml
index cd74cea..62c04b6 100644
--- a/tests/e2e/flows/main.yaml
+++ b/tests/e2e/flows/main.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 120000
+    timeout: 30000
 - assertVisible: "Tapped 0 times"
 - assertVisible: "Tap me"
 - assertVisible: "View Showcase"
diff --git a/tests/e2e/flows/navigation.yaml b/tests/e2e/flows/navigation.yaml
index 73bcfd3..6d14ffd 100644
--- a/tests/e2e/flows/navigation.yaml
+++ b/tests/e2e/flows/navigation.yaml
@@ -4,21 +4,16 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 120000
+    timeout: 30000
 - tapOn: "View Showcase"
 - assertVisible: "Greetings from Home"
-- scroll
-- scroll
-- extendedWaitUntil:
-    visible: "View Forms"
-    timeout: 10000
+- assertVisible: "View Forms"
+- assertVisible: "Back"
 - tapOn: "View Forms"
 - assertVisible: "Forms"
 - assertVisible: "You navigated two levels deep."
-- scroll
-- scroll
-- extendedWaitUntil:
-    visible: "Back to Showcase"
-    timeout: 10000
+- assertVisible: "Back to Showcase"
 - tapOn: "Back to Showcase"
 - assertVisible: "Greetings from Home"
+- tapOn: "Back"
+- assertVisible: "Hello from PythonNative Demo!"
diff --git a/tests/e2e/flows/navigation_android.yaml b/tests/e2e/flows/navigation_android.yaml
index 3ca0ee6..60aba95 100644
--- a/tests/e2e/flows/navigation_android.yaml
+++ b/tests/e2e/flows/navigation_android.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 120000
+    timeout: 30000
 - tapOn: "View Showcase"
 - extendedWaitUntil:
     visible: "Greetings from Home"
diff --git a/tests/e2e/flows/settings_screen.yaml b/tests/e2e/flows/settings_screen.yaml
index e400b39..51792aa 100644
--- a/tests/e2e/flows/settings_screen.yaml
+++ b/tests/e2e/flows/settings_screen.yaml
@@ -4,7 +4,7 @@ appId: ${APP_ID}
 - launchApp
 - extendedWaitUntil:
     visible: "Hello from PythonNative Demo!"
-    timeout: 120000
+    timeout: 30000
 - tapOn: "Settings"
 - extendedWaitUntil:
     visible: "Settings"