diff --git a/.cirrus.yml b/.cirrus.yml
index 70cde87f9d70..0e27cbfa753f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -105,6 +105,8 @@ task:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
     CHANNEL: "master" # Default to flutter master, tests can override.
+  channel_script:
+    - flutter channel $CHANNEL
   flutter_pkg_cache:
     folder: $FLUTTER_HOME/bin/cache/pkg
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
@@ -112,8 +114,6 @@ task:
     folder: $FLUTTER_HOME/bin/cache/artifacts
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   upgrade_script:
-    - which flutter
-    - flutter channel $CHANNEL
     - flutter upgrade
     - git fetch origin master
   activate_script: pub global activate flutter_plugin_tools