diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index b7e40047fd6a..32c6d8d7abf1 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -388,6 +388,7 @@ android-x86_64-tests:
     - web-platform-tests
     - web-platform-tests-crashtest
     - web-platform-tests-reftest
+    - web-platform-tests-wdspec
     - xpcshell
 
 android-hw-aarch64-opt-unittests:
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 9a7eb8a2ef26..d8b09d281360 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -296,11 +296,18 @@ web-platform-tests-wdspec:
             fission: default
             default:
                 by-test-platform:
-                    android.*: 3
+                    android.*: 2
                     default: default
     fetches:
         toolchain:
             by-test-platform:
+                android-em-7.*:
+                    - android-system-image-x86_64-linux
+                    - android-avd-x86_64-linux
+                    - android-emulator-linux
+                    - linux64-geckodriver
+                    - linux64-minidump-stackwalk
+                    - linux64-fix-stacks
                 linux.*64.*:
                     - linux64-geckodriver
                     - linux64-minidump-stackwalk