--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -17,25 +17,29 @@ job-defaults:
         by-test-platform:
             android-em-4.*/.*: ['try', 'mozilla-central']  # bug 1548659
             windows10-aarch64/opt: ['try', 'mozilla-central']
             default: built-projects
     mozharness:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
+                android-hw.*: android_hardware_unittest.py
                 default: desktop_unittest.py
         config:
             by-test-platform:
                 android-em-7.*:
                     - android/android_common.py
                     - android/androidx86_7_0.py
                 android-em-4.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
+                android-hw.*:
+                    - android/android_common.py
+                    - android/android_hw.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_unittest.py
 
@@ -66,26 +70,21 @@ crashtest:
             windows10-aarch64.*: 2
             android-em-4.*/.*: 2  # bug 1548659
             default: default
 
 jsreftest:
     description: "JS Reftest run"
     schedules-component: jsreftest
     treeherder-symbol: R(J)
-    instance-size:
-        by-test-platform:
-            android-em.*: xlarge
-            default: default
+    instance-size: default
     chunks:
         by-test-platform:
-            android-em-4.*\/debug: 100
-            android-em.4.*\/(?:opt|pgo)?: 40
-            android-em-7.*\/debug: 8
-            android-em.7.*\/(?:opt|pgo)?: 4
+            android-hw.*\/debug: 12
+            android-hw.*/(opt|pgo)?: 6
             windows.*: 2
             windows10-64-ccov/debug: 5
             linux64-ccov/.*: 5
             linux64-qr/opt: 4
             linux64-qr/debug: 5
             linux64/debug: 5
             macosx.*64-ccov/debug: 5
             default: 3

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -401,17 +401,16 @@ desktop-screenshot-capture:
     - browser-screenshots
 
 desktop-instrumentation:
     - browser-instrumentation
 
 android-common-tests:
     - crashtest
     - geckoview-junit
-    - jsreftest
     - mochitest
     - mochitest-chrome
     - mochitest-gpu
     - mochitest-media
     - reftest
     - test-verify
     - xpcshell
 
@@ -453,19 +452,22 @@ devtools-tests:
 mochitest-headless:
     - mochitest-plain-headless
 
 marionette-headless:
     - marionette-headless
 
 android-hw-arm7-opt-unittests:
     - jittest
+    - jsreftest
     - mochitest-media
 
 android-hw-arm7-debug-unittests:
+    - jittest
+    - jsreftest
     - mochitest-media
 
 android-hw-arm7-raptor:
     - raptor-speedometer-geckoview
     - raptor-speedometer-refbrow
     - raptor-youtube-playback-geckoview
     - raptor-tp6m-1-geckoview
     - raptor-tp6m-2-geckoview