diff --git a/.cirrus.yml b/.cirrus.yml
index 7f7fb8017..0a394e867 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -32,12 +32,12 @@ check_android_task:
     -n emulator
     -k "system-images;android-30;google_apis;x86"
   start_avd_background_script:
-    $ANDROID_HOME/emulator/emulator
+    while ! [[ $(adb devices | awk 'NR>1 {print $1}') =~ "emulator.*" ]]; do sleep 5 && $ANDROID_HOME/emulator/emulator
     -avd emulator
     -no-audio
     -no-boot-anim
     -gpu swiftshader_indirect
-    -no-snapshot
+    -no-snapshot; done;
   # -no-window is not used here because the flag somehow affects the "GPS" test. actual for API=30
   assemble_instrumented_tests_script:
     ./gradlew -PCI=true assembleDebugAndroidTest