diff --git a/.cirrus.yml b/.cirrus.yml
index 50672854..85d779a6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -37,15 +37,17 @@ task:
           #CHANNEL: "dev"
           #CHANNEL: "beta"
           #CHANNEL: "stable"
-      script:
+      create_avd_script:
         - mkdir -p .android && touch ~/.android/repositories.cfg
         - sdkmanager --list
         - sdkmanager "platform-tools" "system-images;android-30;google_apis;x86"
         - (yes || true) | sdkmanager --licenses
         - echo "no" | avdmanager create avd --force -n Flutter-Android -k "system-images;android-30;google_apis;x86"
-        - echo "no"
+      start_emulator_background_script:
         - emulator -avd Flutter-Android -no-audio -no-window
+      wait_for_emulator_script:
         - adb wait-for-device
         - adb shell input keyevent 82
+      script:
         - flutter channel $CHANNEL
         - ./test.sh $(ipconfig getifaddr en0)