diff --git a/scripts/run_instrumented_tests.sh b/scripts/run_instrumented_tests.sh
old mode 100644
new mode 100755
index aaafe8e..7da104d
--- a/scripts/run_instrumented_tests.sh
+++ b/scripts/run_instrumented_tests.sh
@@ -1,23 +1,10 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-echo "Waiting for emulated storage to be mounted..."
-storage_ready=false
-for i in $(seq 1 30); do
-  if adb shell ls /storage/emulated/0 >/dev/null 2>&1; then
-    echo "Storage mounted."
-    storage_ready=true
-    break
-  fi
-  echo "  attempt $i: storage not ready yet, waiting 2s..."
-  sleep 2
-done
-if [ "$storage_ready" != "true" ]; then
-  echo "ERROR: /storage/emulated/0 not mounted after 60s"
-  exit 1
-fi
+# Wait for boot (android-emulator-runner already does this, but be safe)
+echo "Waiting for device..."
+adb wait-for-device
 
-adb shell mkdir -p /storage/emulated/0/screenshots
 res=0
 ./gradlew connectedOssNoadsDebugAndroidTest -PAPPID=de.szalkowski.activitylauncher.oss --build-cache || res=$?
 mkdir -p screenshots
diff --git a/scripts/run_upgrade_test.sh b/scripts/run_upgrade_test.sh
old mode 100644
new mode 100755
index 0ebef79..72f09d2
--- a/scripts/run_upgrade_test.sh
+++ b/scripts/run_upgrade_test.sh
@@ -1,20 +1,8 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-echo "Waiting for emulated storage to be mounted..."
-storage_ready=false
-for i in $(seq 1 30); do
-  if adb shell ls /storage/emulated/0 >/dev/null 2>&1; then
-    echo "Storage mounted."
-    storage_ready=true
-    break
-  fi
-  echo "  attempt $i: storage not ready yet, waiting 2s..."
-  sleep 2
-done
-if [ "$storage_ready" != "true" ]; then
-  echo "ERROR: /storage/emulated/0 not mounted after 60s"
-  exit 1
-fi
+# Wait for boot (android-emulator-runner already does this)
+echo "Waiting for device..."
+adb wait-for-device
 
 python3 scripts/test_upgrade_shortcut.py