diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index c7460a014a25..756a3791fbbc 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -467,10 +467,11 @@ android-x86_64-tests:
 
 android-x86_64-qr-tests:
     - crashtest
-    - reftest
+    - geckoview-junit
     - mochitest-media
     - mochitest-plain
     - mochitest-plain-gpu
+    - reftest
 
 android-hw-aarch64-opt-unittests:
     - jittest
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index ea2c579a7526..98952b3a8aec 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -1631,7 +1631,10 @@ def enable_webrender(config, tasks):
             extra_options = task['mozharness'].setdefault('extra-options', [])
             extra_options.append("--enable-webrender")
             # We only want to 'setpref' on tests that have a profile
-            if not task['attributes']['unittest_category'] in ['cppunittest', 'gtest', 'raptor']:
+            if not task['attributes']['unittest_category'] in ['cppunittest',
+                                                               'geckoview-junit',
+                                                               'gtest',
+                                                               'raptor']:
                 extra_options.append("--setpref=layers.d3d11.enable-blacklist=false")
 
             # run webrender variants on the projects specified on webrender-run-on-projects