--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -156,16 +156,31 @@ windows10-32-qr/opt:
 
 windows10-32-qr/debug:
     build-platform: win32/debug
     test-sets:
         - web-platform-tests
         - windows32-tests
         - windows-7-tests
 
+windows10-32-2004-shippable-qr/opt:
+    build-platform: win32-shippable/opt
+    test-sets:
+        - windows32-2004-tests
+
+windows10-32-2004-qr/opt:
+    build-platform: win32/opt
+    test-sets:
+        - windows32-2004-tests
+
+windows10-32-2004-qr/debug:
+    build-platform: win32/debug
+    test-sets:
+        - windows32-2004-tests
+
 # win64
 windows10-64-ccov-qr/opt:
     build-platform: win64-ccov/opt
     test-sets:
         - desktop-screenshot-capture
         - windows-ccov-tests
         - ccov-code-coverage-tests
         - windows10-2004-tests  # For Bug 1723531

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -201,28 +201,30 @@ linux-talos-flex:
 windows-7-tests:
     - mochitest-browser-chrome
     - mochitest-webgpu
     - reftest
     - xpcshell
 
 windows32-tests:
     - cppunit
+    - crashtest
+    # - jittest  # See comment in windows-ccov-tests set.
+    - jsreftest
+    - mochitest-plain
+    - mochitest-plain-gpu
+
+windows32-2004-tests:
     - gtest
-    - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
-    # - jittest  # See comment in windows-ccov-tests set.
-    - jsreftest
     - marionette
     - mochitest-a11y
     - mochitest-chrome
     - mochitest-chrome-gpu
-    - mochitest-plain
-    - mochitest-plain-gpu
     - mochitest-media
     - mochitest-remote
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu
     - test-verify-wpt
 
 windows-ccov-tests: