diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
index 26f27c183e20..087b74bff897 100644
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -43,6 +43,8 @@ TEST_SUITES = {
         'aliases': ('c', 'rc'),
         'mach_command': 'crashtest',
         'kwargs': {'test_file': None},
+        'task_regex': ['crashtest($|.*(-1|[^0-9])$)',
+                       'test-verify($|.*(-1|[^0-9])$)'],
     },
     'firefox-ui-functional': {
         'aliases': ('fxfn',),
@@ -214,7 +216,7 @@ _test_flavors = {
     'a11y': 'mochitest-a11y',
     'browser-chrome': 'mochitest-browser',
     'chrome': 'mochitest-chrome',
-    'crashtest': '',
+    'crashtest': 'crashtest',
     'firefox-ui-functional': 'firefox-ui-functional',
     'firefox-ui-update': 'firefox-ui-update',
     'marionette': 'marionette',