diff --git a/.cirrus.yml b/.cirrus.yml
index e9db1b7b6bf8..8172e8133c5a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -57,9 +57,6 @@ task:
     - name: format
       format_script: ./script/incremental_build.sh format --fail-on-change
       license_script:
-        - cd script/tool
-        - pub get
-        - cd ../..
         - dart script/tool/lib/src/main.dart license-check
     - name: test
       env:
@@ -72,7 +69,10 @@ task:
       env:
         matrix:
           CHANNEL: "master"
-      script:
+      tool_script:
+        - cd script/tool
+        - dart analyze --fatal-infos
+      plugins_script:
         - ./script/incremental_build.sh analyze
     ## TODO(cyanglaz):
     ## Combing stable and master analyze jobs when integration test null safety is ready on flutter stable.
diff --git a/script/tool/lib/src/drive_examples_command.dart b/script/tool/lib/src/drive_examples_command.dart
index e52052a49ae6..0230ebd671e1 100644
--- a/script/tool/lib/src/drive_examples_command.dart
+++ b/script/tool/lib/src/drive_examples_command.dart
@@ -101,13 +101,13 @@ class DriveExamplesCommand extends PluginCommand {
                 fileSystem.directory(p.join(example.path, 'integration_test'));
 
             if (await integrationTests.exists()) {
-              await for (final FileSystemEntity integration_test
+              await for (final FileSystemEntity integrationTest
                   in integrationTests.list()) {
-                if (!integration_test.basename.endsWith('_test.dart')) {
+                if (!integrationTest.basename.endsWith('_test.dart')) {
                   continue;
                 }
                 targetPaths
-                    .add(p.relative(integration_test.path, from: example.path));
+                    .add(p.relative(integrationTest.path, from: example.path));
               }
             }
 
diff --git a/script/tool/lib/src/version_check_command.dart b/script/tool/lib/src/version_check_command.dart
index 0b552e8bff4d..39fecc03924c 100644
--- a/script/tool/lib/src/version_check_command.dart
+++ b/script/tool/lib/src/version_check_command.dart
@@ -187,7 +187,7 @@ class VersionCheckCommand extends PluginCommand {
 
     // Skip validation for the special NEXT version that's used to accumulate
     // changes that don't warrant publishing on their own.
-    bool hasNextSection = versionString == 'NEXT';
+    final bool hasNextSection = versionString == 'NEXT';
     if (hasNextSection) {
       print('Found NEXT; validating next version in the CHANGELOG.');
       // Ensure that the version in pubspec hasn't changed without updating