diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index bcd05bcb64a5..e3567b5e57eb 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -406,7 +406,7 @@ android-hw-g5-7-0-arm7-api-16/pgo:
 android-hw-p2-8-0-arm7-api-16/pgo:
     build-platform: android-api-16-pgo/opt
     test-sets:
-        - android-hw-arm7-opt-unittests
+        - android-hw-arm7-pgo-unittests
         - android-hw-arm7-raptor
         - android-hw-arm7-raptor-power
         - raptor-fetch-geckoview
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 815b0ccd0be4..d02a4e6ca3ce 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -455,6 +455,10 @@ marionette-headless:
     - marionette-headless
 
 android-hw-arm7-opt-unittests:
+    - jittest
+    - mochitest-media
+
+android-hw-arm7-pgo-unittests:
     - jittest
     - jsreftest
     - mochitest-media