diff --git a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
index 82b5c158b26e..c92e2a06fd1d 100644
--- a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
+++ b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
@@ -122,6 +122,10 @@ class SingleTestMixin(object):
 
             self.info("Per-test run found test %s (%s)" % (file, entry[0]))
             subsuite_mapping = {
+                # Map (<suite>, <subsuite>): <full-suite>
+                #   <suite> is associated with a manifest, explicitly in code above
+                #   <subsuite> comes from "subsuite" tags in some manifest entries
+                #   <full-suite> is a unique id for the suite, matching desktop mozharness configs
                 ('browser-chrome', 'clipboard'): 'browser-chrome-clipboard',
                 ('chrome', 'clipboard'): 'chrome-clipboard',
                 ('plain', 'clipboard'): 'plain-clipboard',
diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py
index be50573adc01..60ca76b7ad6f 100644
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -612,12 +612,17 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi
         if self.test_suite:
             return [(self.test_suite, self.test_suite)]
         # per-test mode: determine test suites to run
+
+        # For each test category, provide a list of supported sub-suites and a mapping
+        # between the per_test_base suite name and the android suite name.
         all = [('mochitest', {'plain': 'mochitest',
                               'chrome': 'mochitest-chrome',
+                              'mochitest-media': 'mochitest-media',
                               'plain-clipboard': 'mochitest-plain-clipboard',
                               'plain-gpu': 'mochitest-plain-gpu'}),
                ('reftest', {'reftest': 'reftest',
-                            'crashtest': 'crashtest'}),
+                            'crashtest': 'crashtest',
+                            'jsreftest': 'jsreftest'}),
                ('xpcshell', {'xpcshell': 'xpcshell'})]
         suites = []
         for (category, all_suites) in all: