diff --git a/.cirrus.yml b/.cirrus.yml
index bd21b3c959584..4f3712161df32 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,7 +5,6 @@ task:
   env:
     CIRRUS_WORKING_DIR: "/tmp/flutter sdk"
     PATH: "$CIRRUS_WORKING_DIR/bin:$CIRRUS_WORKING_DIR/bin/cache/dart-sdk/bin:$PATH"
-    SHARD: "$CIRRUS_TASK_NAME"
 
   git_fetch_script: git fetch origin
   setup_script: |
@@ -20,16 +19,25 @@ task:
 
   matrix:
     - name: docs
+      env:
+        SHARD: docs
       docs_script: ./dev/bots/docs.sh
     - name: analyze
+      env:
+        SHARD: analyze
       test_script: dart ./dev/bots/test.dart
-    - name: tests
+    - name: tests-linux
+      env:
+        SHARD: tests
       test_script: dart ./dev/bots/test.dart
       container:
         cpu: 4
         memory: 8G
 
-windows_task:
+task:
+  name: tests-windows
+  env:
+    SHARD: tests
   windows_container:
     dockerfile: dev/bots/docker/Dockerfile.windows
   env: