--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -128,34 +128,35 @@ jsdcov-code-coverage-tests:
 windows-vm-tests:
     - cppunit
     - crashtest
     - gtest
     - jittest
     - jsreftest
     - marionette
     - mochitest
+    - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
     - mochitest-jetpack
     - mochitest-media
     - web-platform-tests
     - web-platform-tests-reftests
     #- xpcshell
 
 windows-gpu-tests:
     - reftest
     - reftest-no-accel
+    - mochitest-gpu
     - mochitest-webgl
 
 # these tests currently run on hardware, but may migrate above when validated
-#    - mochitest-a11y
+# see https://bugzilla.mozilla.org/show_bug.cgi?id=1280474#c36
 #    - mochitest-chrome
 #    - mochitest-clipboard
-#    - mochitest-gpu
 
 macosx64-tests-debug:
     - cppunit
     - crashtest
     - external-media-tests-base
     - external-media-tests-youtube
     - gtest
     - jittest