diff --git a/.ci.yaml b/.ci.yaml
index ebedd203b3ca..a63f149403d9 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -35,6 +35,7 @@ platform_properties:
       os: Windows
 
 targets:
+  # TODO(stuartmorgan) Remove once the renamed version below has propagated.
   - name: Windows Plugins master channel
     recipe: plugins/plugins
     timeout: 30
@@ -47,6 +48,7 @@ targets:
         ]
     scheduler: luci
 
+  # TODO(stuartmorgan) Remove once the renamed version below has propagated.
   - name: Windows Plugins stable channel
     recipe: plugins/plugins
     timeout: 30
@@ -60,6 +62,88 @@ targets:
         ]
     scheduler: luci
 
+  - name: Windows win32_build+platform-tests master
+    recipe: plugins/plugins
+    bringup: true
+    timeout: 30
+    properties:
+      # TODO(stuartmorgan): Uncomment when removing bringup.
+      #add_recipes_cq: "true"
+      target_file: windows_build_and_platform_tests.yaml
+      dependencies: >
+        [
+          {"dependency": "vs_build"}
+        ]
+    scheduler: luci
+
+  - name: Windows win32_build+platform-tests stable
+    recipe: plugins/plugins
+    bringup: true
+    timeout: 30
+    properties:
+      # TODO(stuartmorgan): Uncomment when removing bringup.
+      #add_recipes_cq: "true"
+      target_file: uwp_build_and_platform_tests.yaml
+      channel: stable
+      dependencies: >
+        [
+          {"dependency": "vs_build"}
+        ]
+    scheduler: luci
+
+  - name: Windows build_all_plugins master
+    recipe: plugins/plugins
+    bringup: true
+    timeout: 30
+    properties:
+      # TODO(stuartmorgan): Uncomment when removing bringup.
+      #add_recipes_cq: "true"
+      target_file: build_all_plugins.yaml
+      dependencies: >
+        [
+          {"dependency": "vs_build"}
+        ]
+    scheduler: luci
+
+  - name: Windows build_all_plugins stable
+    recipe: plugins/plugins
+    bringup: true
+    timeout: 30
+    properties:
+      # TODO(stuartmorgan): Uncomment when removing bringup.
+      #add_recipes_cq: "true"
+      target_file: build_all_plugins.yaml
+      channel: stable
+      dependencies: >
+        [
+          {"dependency": "vs_build"}
+        ]
+    scheduler: luci
+
+  - name: Windows uwp-build+platform-tests master
+    recipe: plugins/plugins
+    bringup: true
+    timeout: 30
+    properties:
+      # TODO(stuartmorgan): Uncomment when removing bringup.
+      #add_recipes_cq: "true"
+      target_file: uwp_build_and_platform_tests.yaml
+      dependencies: >
+        [
+          {"dependency": "vs_build"}
+        ]
+    scheduler: luci
+
+  - name: Windows plugin_tools_tests
+    recipe: plugins/plugins
+    bringup: true
+    timeout: 30
+    properties:
+      # TODO(stuartmorgan): Uncomment when removing bringup.
+      #add_recipes_cq: "true"
+      target_file: plugin_tools_tests.yaml
+    scheduler: luci
+
   - name: Linux ci_yaml plugins roller
     recipe: infra/ci_yaml
     timeout: 30
diff --git a/.ci/scripts/build_all_plugins.sh b/.ci/scripts/build_all_plugins.sh
new file mode 100644
index 000000000000..008dea7c5e13
--- /dev/null
+++ b/.ci/scripts/build_all_plugins.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+cd all_plugins
+flutter build windows --debug
+flutter build windows --release
diff --git a/.ci/scripts/build_examples_uwp.sh b/.ci/scripts/build_examples_uwp.sh
new file mode 100644
index 000000000000..639cb054e4b7
--- /dev/null
+++ b/.ci/scripts/build_examples_uwp.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --winuwp \
+   --packages-for-branch
diff --git a/.ci/scripts/create_all_plugins_app.sh b/.ci/scripts/create_all_plugins_app.sh
new file mode 100644
index 000000000000..196fef9b06c9
--- /dev/null
+++ b/.ci/scripts/create_all_plugins_app.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+dart ./script/tool/bin/flutter_plugin_tools.dart all-plugins-app \
+    --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
diff --git a/.ci/scripts/native_test_win32.sh b/.ci/scripts/native_test_win32.sh
new file mode 100644
index 000000000000..938515784412
--- /dev/null
+++ b/.ci/scripts/native_test_win32.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+dart ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \
+   --no-integration --packages-for-branch
diff --git a/.ci/scripts/plugin_tools_tests.sh b/.ci/scripts/plugin_tools_tests.sh
new file mode 100644
index 000000000000..96eec4349f08
--- /dev/null
+++ b/.ci/scripts/plugin_tools_tests.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+cd script/tool
+dart pub run test
diff --git a/.ci/targets/build_all_plugins.yaml b/.ci/targets/build_all_plugins.yaml
new file mode 100644
index 000000000000..b51a5b18dfd9
--- /dev/null
+++ b/.ci/targets/build_all_plugins.yaml
@@ -0,0 +1,7 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: create all_plugins app
+    script: .ci/scripts/create_all_plugins_app.sh
+  - name: build all_plugins
+    script: .ci/scripts/build_all_plugins.sh
diff --git a/.ci/targets/plugin_tools_tests.yaml b/.ci/targets/plugin_tools_tests.yaml
new file mode 100644
index 000000000000..265e74bdd06b
--- /dev/null
+++ b/.ci/targets/plugin_tools_tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: tool unit tests
+    script: .ci/scripts/plugin_tools_tests.sh
diff --git a/.ci/targets/uwp_build_and_platform_tests.yaml b/.ci/targets/uwp_build_and_platform_tests.yaml
new file mode 100644
index 000000000000..a7f070776ff1
--- /dev/null
+++ b/.ci/targets/uwp_build_and_platform_tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+  - name: build examples (UWP)
+    script: .ci/scripts/build_examples_uwp.sh
diff --git a/.ci/targets/windows_build_and_platform_tests.yaml b/.ci/targets/windows_build_and_platform_tests.yaml
index cba120073310..cda3e57f75d2 100644
--- a/.ci/targets/windows_build_and_platform_tests.yaml
+++ b/.ci/targets/windows_build_and_platform_tests.yaml
@@ -1,8 +1,9 @@
-
 tasks:
-  - name: "prepare tool"
+  - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
-  - name: "build examples"
+  - name: build examples (Win32)
     script: .ci/scripts/build_examples_win32.sh
-  - name: "drive examples"
+  - name: native unit tests (Win32)
+    script: .ci/scripts/native_test_win32.sh
+  - name: drive examples (Win32)
     script: .ci/scripts/drive_examples_win32.sh
diff --git a/.cirrus.yml b/.cirrus.yml
index 10d668d8d1d7..56f312dea929 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -66,7 +66,7 @@ task:
     - name: plugin_tools_tests
       script:
         - cd script/tool
-        - CIRRUS_BUILD_ID=null pub run test
+        - dart pub run test
     - name: publishable
       version_check_script: ./script/tool_runner.sh version-check
       publish_check_script: ./script/tool_runner.sh publish-check