--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -35,22 +35,24 @@ linux32-devedition/opt:
         -  linux32-tests
         -  linux32-opt-tests
 
 linux64/debug:
     build-platform: linux64/debug
     test-sets:
         - common-tests
         - web-platform-tests
+        - reftest-stylo
 linux64/opt:
     build-platform: linux64/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - opt-only-tests
+        - reftest-stylo
         - desktop-screenshot-capture
         - talos
         - awsy
 linux64-nightly/opt:
     build-platform: linux64-nightly/opt
     test-sets:
         - common-tests
         - web-platform-tests

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -79,29 +79,31 @@ awsy-stylo-sequential:
 
 ##
 # Limited test sets for specific platforms
 
 stylo-tests:
     - cppunit
     - crashtest
     - reftest
-    - reftest-stylo
     - web-platform-tests
     - web-platform-tests-reftests
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-browser-screenshots
     - mochitest-chrome
     - mochitest-clipboard
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl
 
+reftest-stylo:
+    - reftest-stylo
+
 qr-talos:
     - talos-chrome
     - talos-dromaeojs
     - talos-g1
     # - talos-g2 # doesn't work with QR yet
     - talos-g3
     - talos-g4
     - talos-g5

--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1244,26 +1244,22 @@ reftest-no-accel:
         extra-options:
             - --reftest-suite=reftest-no-accel
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 reftest-stylo:
-    description: "Reftest run for Stylo"
+    description: "Reftest run in Stylo vs. Gecko mode"
     suite: reftest/reftest-stylo
     treeherder-symbol: tc-R(Rs)
     virtualization: virtual-with-gpu
     chunks: 8
-    run-on-projects:
-        by-test-platform:
-            windows10.*: []
-            macosx.*: []
-            default: ['autoland', 'mozilla-central', 'try']
+    run-on-projects: ['autoland', 'mozilla-central', 'try']
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:

--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -767,26 +767,24 @@ def set_test_type(config, tests):
             if test_type in test['suite'] and 'web-platform' not in test['suite']:
                 test.setdefault('tags', {})['test-type'] = test_type
         yield test
 
 
 @transforms.add
 def enable_stylo(config, tests):
     """
-    Force Stylo on for all its tests, except Stylo vs. Gecko reftests where the
-    test harness will handle this.
+    Force Stylo on for all its tests.
     """
     for test in tests:
         if '-stylo' not in test['test-platform']:
             yield test
             continue
 
-        if 'reftest-stylo' not in test['suite']:
-            test['mozharness'].setdefault('extra-options', []).append('--enable-stylo')
+        test['mozharness'].setdefault('extra-options', []).append('--enable-stylo')
 
         yield test
 
 
 @transforms.add
 def single_stylo_traversal_tests(config, tests):
     """Enable single traversal for all tests on the sequential Stylo platform."""