--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -72,38 +72,73 @@ TEST_SUITES = {
         'task_regex': 'mochitest-browser-chrome(?:-e10s)?(?:-1)?$',
     },
     'mochitest-chrome': {
         'aliases': ('mc',),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'chrome', 'test_paths': None},
         'task_regex': 'mochitest-chrome(?:-e10s)?(?:-1)?$',
     },
+    'mochitest-clipboard': {
+        'aliases': ('cl', 'clipboard',),
+        'mach_command': 'mochitest',
+        'kwargs': {'subsuite': 'clipboard', 'test_paths': None},
+        'task_regex': 'mochitest-clipboard(?:-e10s)?(?:-1)?$',
+    },
     'mochitest-devtools': {
         'aliases': ('dt', 'devtools-chrome'),
         'mach_command': 'mochitest',
-        'kwargs': {'subsuite': 'devtools', 'test_paths': None},
+        'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'devtools', 'test_paths': None},
         'task_regex': 'mochitest-devtools-chrome(?:-e10s)?(?:-1)?$',
     },
+    'mochitest-gpu': {
+        'aliases': ('gpu',),
+        'mach_command': 'mochitest',
+        'kwargs': {'subsuite': 'gpu', 'test_paths': None},
+        'task_regex': 'mochitest-gpu(?:-e10s)?(?:-1)?$',
+    },
+    'mochitest-media': {
+        'aliases': ('mpm', 'plain-media'),
+        'mach_command': 'mochitest',
+        'kwargs': {'flavor': 'plain', 'subsuite': 'media', 'test_paths': None},
+        'task_regex': 'mochitest-media(?:-e10s)?(?:-1)?$',
+    },
     'mochitest-plain': {
         'aliases': ('mp', 'plain',),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'plain', 'test_paths': None},
         'task_regex': 'mochitest(?:-e10s)?(?:-1)?$',
     },
+    'mochitest-screenshots': {
+        'aliases': ('ss', 'screenshots-chrome'),
+        'mach_command': 'mochitest',
+        'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'screenshots', 'test_paths': None},
+        'task_regex': 'browser-screenshots(?:-e10s)?(?:-1)?$',
+    },
+    'mochitest-webgl': {
+        'aliases': ('webgl',),
+        'mach_command': 'mochitest',
+        'kwargs': {'flavor': 'plain', 'subsuite': 'webgl', 'test_paths': None},
+        'task_regex': 'mochitest-webgl(?:-e10s)?(?:-1)?$',
+    },
     'python': {
         'mach_command': 'python-test',
         'kwargs': {'tests': None},
     },
     'reftest': {
         'aliases': ('rr',),
         'mach_command': 'reftest',
         'kwargs': {'tests': None},
         'task_regex': '(opt|debug)-reftest(?:-no-accel|-gpu|-stylo)?(?:-e10s)?(?:-1)?$',
     },
+    'robocop': {
+        'mach_command': 'robocop',
+        'kwargs': {'test_paths': None},
+        'task_regex': 'robocop(?:-e10s)?(?:-1)?$',
+    },
     'web-platform-tests': {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
         'kwargs': {'include': []},
         'task_regex': 'web-platform-tests(?:-reftests|-wdspec)?(?:-e10s)?(?:-1)?$',
     },
     'valgrind': {
         'aliases': ('v',),
@@ -144,17 +179,27 @@ for i in range(1, MOCHITEST_TOTAL_CHUNKS
     'python': 'python',
     'reftest': 'reftest',
     'steeplechase': '',
     'web-platform-tests': 'web-platform-tests',
     'xpcshell': 'xpcshell',
 }
 
 _test_subsuites = {
+    ('browser-chrome', 'clipboard'): 'mochitest-clipboard',
     ('browser-chrome', 'devtools'): 'mochitest-devtools',
+    ('browser-chrome', 'gpu'): 'mochitest-gpu',
+    ('browser-chrome', 'screenshots'): 'mochitest-screenshots',
+    ('chrome', 'clipboard'): 'mochitest-clipboard',
+    ('chrome', 'gpu'): 'mochitest-gpu',
+    ('mochitest', 'clipboard'): 'mochitest-clipboard',
+    ('mochitest', 'gpu'): 'mochitest-gpu',
+    ('mochitest', 'media'): 'mochitest-media',
+    ('mochitest', 'robocop'): 'robocop',
+    ('mochitest', 'webgl'): 'mochitest-webgl',
 }
 
 
 def get_suite_definition(flavor, subsuite=None, strict=False):
     """Return a suite definition given a flavor and optional subsuite.
 
     If strict is True, a subsuite must have its own entry in TEST_SUITES.
     Otherwise, the entry for 'flavor' will be returned with the 'subsuite'