diff --git a/.cirrus.yml b/.cirrus.yml
index 881f5a72..db74129b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -48,7 +48,7 @@ task:
       create_device_script:
         echo no | avdmanager create avd --force -n test -k "system-images;android-$ANDROID_EMULATOR_API_LEVEL;$ANDROID_ABI"
       start_emulator_background_script:
-        $ANDROID_SDK_ROOT/emulator/emulator-headless -verbose -avd test -no-audio -no-window
+        $ANDROID_SDK_ROOT/emulator/emulator -verbose -avd test -no-audio -no-window
       pub_cache:
         folder: ~/.pub-cache
       wait_for_emulator_script:
diff --git a/.travis.yml b/.travis.yml
index e53162d6..4c550920 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,13 @@
 language: dart
 
 install:
-  - source ~/.zprofile
   - export HOMEBREW_NO_AUTO_UPDATE=1
   - brew install node
   - brew install libimobiledevice ideviceinstaller ios-deploy
   - brew install cocoapods || echo 'ignore exit(1)'
   - brew link --overwrite cocoapods
-  - echo 'export FLUTTER_HOME=$HOME/flutter' >> ~/.zprofile
-  - echo 'export PATH=$HOME/flutter:$HOME/flutter/bin/:$HOME/flutter/bin/cache/dart-sdk/bin:$PATH' >> ~/.zprofile
-  - source ~/.zprofile
+  - export FLUTTER_HOME=$HOME/flutter
+  - export PATH=$HOME/flutter:$HOME/flutter/bin/:$HOME/flutter/bin/cache/dart-sdk/bin:$PATH
   - git clone https://github.com/flutter/flutter.git $FLUTTER_HOME
   - cd $FLUTTER_HOME
   - git checkout beta
diff --git a/scripts/android-wait-for-emulator.sh b/scripts/android-wait-for-emulator.sh
old mode 100644
new mode 100755