diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 109f8479..b525451e 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -86,7 +86,7 @@ jobs:
           disable-animations: true
           script: |
             adb install androidApp/build/outputs/apk/debug/androidApp-debug.apk
-            maestro test --debug-output maestro-debug -e APP_ID=dev.johnoreilly.galwaybus maestro/GalwayBus.flow
+            maestro test --debug-output maestro-debug -e APP_ID=dev.johnoreilly.galwaybus maestro/GalwayBus.flow; status=$?; mkdir -p maestro-debug; adb logcat -d > maestro-debug/logcat.txt; exit $status
 
       # takeScreenshot output: Maestro saves it under --debug-output's hidden .maestro directory
       - uses: actions/upload-artifact@v7
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index c81e334b..984b356b 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -17,6 +17,12 @@
         <meta-data
                 android:name="com.google.android.geo.API_KEY"
                 android:value="${MAPS_API_KEY}"/>
+        <!-- Older Google Play services' Maps module uses the Apache HTTP client, which apps
+             targeting API 28+ must opt into or the map crashes (NoClassDefFoundError:
+             org/apache/http/ProtocolVersion) -->
+        <uses-library
+                android:name="org.apache.http.legacy"
+                android:required="false"/>
         <activity
                 android:exported="true"
                 android:name=".MainActivity">
diff --git a/maestro/GalwayBus.flow b/maestro/GalwayBus.flow
index a9e1ad6e..69a2d3d1 100644
--- a/maestro/GalwayBus.flow
+++ b/maestro/GalwayBus.flow
@@ -20,3 +20,7 @@ appId: ${APP_ID}
     visible: "Updated.*"
     timeout: 30000
 - takeScreenshot: GalwayBus
+# Still showing after the map has had time to render (a crash there would otherwise go unnoticed)
+- waitForAnimationToEnd:
+    timeout: 5000
+- assertVisible: "Route 402"