diff --git a/.cirrus.yml b/.cirrus.yml
index 6300a56e106f..ade3ca70747f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,7 +8,7 @@ tool_setup_template: &TOOL_SETUP_TEMPLATE
     - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
     # Pinned version of the plugin tools, to avoid breakage in this repository
     # when pushing updates from flutter/plugins.
-    - dart pub global activate flutter_plugin_tools 0.3.0
+    - dart pub global activate flutter_plugin_tools 0.5.0
 
 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
   upgrade_flutter_script:
@@ -53,7 +53,7 @@ task:
       script: ./script/tool_runner.sh test --exclude=flutter_image
       depends_on:
         - format+analyze
-    - name: build-apks+java-test
+    - name: android-build+platform-tests
       env:
         matrix:
           CHANNEL: "master"
@@ -63,7 +63,8 @@ task:
           BUILD_SHARDING: "--shardIndex 1 --shardCount 2"
       script:
         - ./script/tool_runner.sh build-examples --apk
-        - ./script/tool_runner.sh java-test  # must come after apk build
+        # Must come after apk build:
+        - ./script/tool_runner.sh native-test --android --no-integration
       depends_on:
         - format+analyze
     - name: web_benchmarks_test
@@ -78,7 +79,7 @@ task:
         - dart testing/web_benchmarks_test.dart
 
 task:
-  name: build-ipas
+  name: ios-build+platform-test
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
     image: big-sur-xcode-12.4
@@ -92,7 +93,7 @@ task:
       BUILD_SHARDING: "--shardIndex 1 --shardCount 2"
   << : *FLUTTER_UPGRADE_TEMPLATE
   build_script:
-    - ./script/tool_runner.sh build-examples --ipa
+    - ./script/tool_runner.sh build-examples --ios
 
 task:
   name: local_tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c263707bc203..787f5c6a586b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools
-      run: dart pub global activate flutter_plugin_tools 0.3.0
+      run: dart pub global activate flutter_plugin_tools 0.5.0
 
     # # This workflow should be the last to run. So wait for all the other tests to succeed.
     - name: Wait on all tests
diff --git a/script/tool_runner.sh b/script/tool_runner.sh
index 11c79ccd82f0..51f57ab8431c 100755
--- a/script/tool_runner.sh
+++ b/script/tool_runner.sh
@@ -7,11 +7,7 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 REPO_DIR="$(dirname "$SCRIPT_DIR")"
 
-# Set some default actions if run without arguments.
 ACTIONS=("$@")
-if [[ "${#ACTIONS[@]}" == 0 ]]; then
-  ACTIONS=("test" "analyze" "java-test")
-fi
 
 BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
 if [[ "${BRANCH_NAME}" == "master" ]]; then