diff --git a/.cirrus.yml b/.cirrus.yml
index bd730c93..2c963e51 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,6 +1,4 @@
 task:
-  only_if: $CIRRUS_PR == ''
-  skip: '!changesInclude(".cirrus.yml")'
   env:
     ANDROID_EMULATOR_API_LEVEL: 30
     ANDROID_ABI: "google_apis;x86"
@@ -43,10 +41,10 @@ task:
           #CHANNEL: "beta"
           #CHANNEL: "stable"
       install_images_script:
-        #- mkdir -p .android && touch ~/.android/repositories.cfg
+        - mkdir -p .android && touch ~/.android/repositories.cfg
         #- sdkmanager --list
         - sdkmanager "system-images;android-$ANDROID_EMULATOR_API_LEVEL;$ANDROID_ABI"
-        #- (yes || true) | sdkmanager --licenses
+        - (yes || true) | sdkmanager --licenses
       create_device_script:
         echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$ANDROID_ABI"
       start_emulator_background_script:
diff --git a/.travis.yml b/.travis.yml
index 4303ae97..5ea351b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,26 +11,27 @@ env:
     - ANDROID_API=30
 
 install:
-  - git clone $FLUTTER_GITHUB -b master --depth 1
+  - 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
+  - git clone $FLUTTER_GITHUB -b stable --depth 1
+  - $FLUTTER upgrade
+  - $FLUTTER channel master
+  - $FLUTTER upgrade
   - $FLUTTER doctor
   - $FLUTTER pub get
 
-
 jobs:
   include:
     - stage: iOS Integration Tests
       os: osx
       osx_image: xcode12.3
       before_script:
-        - brew install node
         - cd ./nodejs_server_test_auth_basic_and_ssl
         - npm install
         - cd ..
-        - open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app
-        - export HOMEBREW_NO_AUTO_UPDATE=1
-        - brew install libimobiledevice ideviceinstaller ios-deploy
-        - brew install cocoapods || echo 'ignore exit(1)'
-        - brew link --overwrite cocoapods
         - xcrun simctl list
         - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-12 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
       script: