diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index 39893ad2a62b..9a8fa4218f03 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -51,10 +51,8 @@ job-defaults:
                 windows.*:
                     - unittests/win_unittest.py
 
-mochitest:
+mochitest-plain:
     description: "Mochitest plain run"
-    suite:
-        name: mochitest-plain
     treeherder-symbol: M()
     loopback-video: true
     tier:
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 37fcfda8ffe1..4b9aaeb573fc 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -346,7 +346,7 @@ linux1804-tests:
     - gtest
     - jsreftest
     - jittest
-    - mochitest
+    - mochitest-plain
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
@@ -373,7 +373,7 @@ linux1804-qr-tests:
     - gtest
     - jittest
     - jsreftest
-    - mochitest
+    - mochitest-plain
     - mochitest-a11y
     - mochitest-chrome
     - mochitest-gpu
@@ -394,7 +394,7 @@ linux1804-ccov-tests:
     - gtest
     - jittest
     - jsreftest
-    - mochitest
+    - mochitest-plain
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
@@ -426,7 +426,7 @@ linux-talos-flex:
 
 windows-qr-tests:
     - crashtest
-    - mochitest
+    - mochitest-plain
     - mochitest-browser-chrome
     - mochitest-gpu
     - mochitest-media
@@ -447,7 +447,7 @@ windows-tests:
     - jittest
     - jsreftest
     - marionette
-    - mochitest
+    - mochitest-plain
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
@@ -491,7 +491,7 @@ windows-aarch64-tests:
     - crashtest
     - gtest
     - marionette
-    - mochitest
+    - mochitest-plain
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
@@ -541,7 +541,7 @@ macosx1014-64-tests:
     - jittest
     - jsreftest
     - marionette
-    - mochitest
+    - mochitest-plain
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
@@ -595,7 +595,7 @@ android-x86_64-tests:
     - crashtest
     - geckoview-junit
     - gtest
-    - mochitest
+    - mochitest-plain
     - mochitest-gpu
     - mochitest-media
     # - mochitest-webgl1-core # Harness issues?
@@ -1007,5 +1007,5 @@ android-hw-arm7-browsertime:
     - browsertime-benchmark-speedometer
 
 linux-tsan-tests:
-    - mochitest
+    - mochitest-plain
     - xpcshell
diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
index 14178a6ce088..7008d2194601 100644
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -139,7 +139,7 @@ TEST_SUITES = {
         'build_flavor': 'mochitest',
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'plain', 'test_paths': None},
-        'task_regex': ['mochitest(?!-a11y|-browser|-chrome|-devtools|-gpu|-harness|-media|-screen|-webgl)($|.*(-1|[^0-9])$)',  # noqa
+        'task_regex': ['mochitest-plain($|.*(-1|[^0-9])$)',  # noqa
                        'test-verify($|.*(-1|[^0-9])$)'],
     },
     'mochitest-plain-gpu': {
diff --git a/testing/mozbase/moztest/tests/test_resolve.py b/testing/mozbase/moztest/tests/test_resolve.py
index f81cc2e9a9b4..a51393be52e9 100644
--- a/testing/mozbase/moztest/tests/test_resolve.py
+++ b/testing/mozbase/moztest/tests/test_resolve.py
@@ -306,8 +306,8 @@ def test_task_regexes():
         'test-linux64/opt-browser-screenshots-1',
         'test-linux64/opt-browser-screenshots-e10s-1',
         'test-linux64/opt-marionette',
-        'test-linux64/opt-mochitest',
-        'test-linux64/debug-mochitest-e10s',
+        'test-linux64/opt-mochitest-plain',
+        'test-linux64/debug-mochitest-plain-e10s',
         'test-linux64/opt-mochitest-a11y',
         'test-linux64/opt-mochitest-browser',
         'test-linux64/opt-mochitest-browser-chrome',
@@ -320,7 +320,6 @@ def test_task_regexes():
         'test-linux64/opt-mochitest-gpu-e10s',
         'test-linux64/opt-mochitest-media-e10s-1',
         'test-linux64/opt-mochitest-media-e10s-11',
-        'test-linux64/opt-mochitest-plain',
         'test-linux64/opt-mochitest-screenshots-1',
         'test-linux64/opt-reftest',
         'test-linux64/debug-reftest-e10s-1',
@@ -356,10 +355,8 @@ def test_task_regexes():
             'test-linux64/opt-mochitest-media-e10s-1',
         ],
         'mochitest-plain': [
-            'test-linux64/opt-mochitest',
-            'test-linux64/debug-mochitest-e10s',
-            # this isn't a real task but the regex would match it if it were
             'test-linux64/opt-mochitest-plain',
+            'test-linux64/debug-mochitest-plain-e10s',
         ],
         'mochitest-plain-gpu': [
             'test-linux64/opt-mochitest-gpu',