diff --git a/python/mozbuild/mozbuild/schedules.py b/python/mozbuild/mozbuild/schedules.py
index 416d313b5277..de3e0a4d7f28 100644
--- a/python/mozbuild/mozbuild/schedules.py
+++ b/python/mozbuild/mozbuild/schedules.py
@@ -58,8 +58,8 @@ EXCLUSIVE_COMPONENTS = [
     'xpcshell',
     'xpcshell-coverage',
     'web-platform-tests',
-    'web-platform-tests-crashtests',
-    'web-platform-tests-reftests',
+    'web-platform-tests-crashtest',
+    'web-platform-tests-reftest',
     'web-platform-tests-wdspec',
     # specific test suites via schedules-component
     'mochitest-a11y',
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 67b9c18e01ef..70c537ba990d 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -17,8 +17,8 @@
 
 web-platform-tests:
     - web-platform-tests
-    - web-platform-tests-crashtests
-    - web-platform-tests-reftests
+    - web-platform-tests-crashtest
+    - web-platform-tests-reftest
     - web-platform-tests-wdspec
 
 web-platform-tests-wdspec-headless:
@@ -509,8 +509,8 @@ macosx1014-64-tests:
     - test-verify-gpu
     - test-verify-wpt
     - web-platform-tests
-    - web-platform-tests-crashtests
-    - web-platform-tests-reftests
+    - web-platform-tests-crashtest
+    - web-platform-tests-reftest
     - web-platform-tests-wdspec
     - xpcshell
 
@@ -555,8 +555,8 @@ android-x86_64-tests:
     - reftest
     - test-verify
     - web-platform-tests
-    - web-platform-tests-crashtests
-    - web-platform-tests-reftests
+    - web-platform-tests-crashtest
+    - web-platform-tests-reftest
     - xpcshell
 
 android-x86_64-qr-tests:
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index b4dd7fa15719..a61d2507f42c 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -77,11 +77,9 @@ web-platform-tests:
         extra-options:
             - --test-type=testharness
 
-web-platform-tests-reftests:
+web-platform-tests-reftest:
     description: "Web platform reftest run"
-    suite:
-        name: web-platform-tests-reftests
-    schedules-component: web-platform-tests-reftests
+    schedules-component: web-platform-tests-reftest
     treeherder-symbol: W(Wr)
     virtualization:
         by-test-platform:
@@ -152,11 +150,9 @@ web-platform-tests-wdspec-headless:
                     - --setpref=toolkit.asyncshutdown.log=true
                     - --headless
 
-web-platform-tests-crashtests:
+web-platform-tests-crashtest:
     description: "Web platform crashtests run"
-    suite:
-        name: web-platform-tests-crashtests
-    schedules-component: web-platform-tests-crashtests
+    schedules-component: web-platform-tests-crashtest
     treeherder-symbol: W(Wc)
     chunks: 1
     mozharness:
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index d4dfdd63e28b..88a132c55e40 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -1290,8 +1290,8 @@ CHUNK_SUITES_BLACKLIST = (
     'test-verify-gpu',
     'test-verify-wpt',
     'web-platform-tests',
-    'web-platform-tests-crashtests',
-    'web-platform-tests-reftests',
+    'web-platform-tests-crashtest',
+    'web-platform-tests-reftest',
     'web-platform-tests-wdspec',
 )
 """These suites will be chunked at test runtime rather than here in the taskgraph."""
diff --git a/taskcluster/taskgraph/try_option_syntax.py b/taskcluster/taskgraph/try_option_syntax.py
index a7afeb84409a..d545640448e2 100644
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -98,9 +98,9 @@ UNITTEST_ALIASES = {
     'web-platform-test': alias_prefix('web-platform-tests'),
     'web-platform-tests': alias_prefix('web-platform-tests'),
     'web-platform-tests-e10s': alias_prefix('web-platform-tests-e10s'),
-    'web-platform-tests-crashtests': alias_prefix('web-platform-tests-crashtests'),
-    'web-platform-tests-reftests': alias_prefix('web-platform-tests-reftests'),
-    'web-platform-tests-reftests-e10s': alias_prefix('web-platform-tests-reftests-e10s'),
+    'web-platform-tests-crashtests': alias_prefix('web-platform-tests-crashtest'),
+    'web-platform-tests-reftests': alias_prefix('web-platform-tests-reftest'),
+    'web-platform-tests-reftests-e10s': alias_prefix('web-platform-tests-reftest-e10s'),
     'web-platform-tests-wdspec': alias_prefix('web-platform-tests-wdspec'),
     'web-platform-tests-wdspec-e10s': alias_prefix('web-platform-tests-wdspec-e10s'),
     'xpcshell': alias_prefix('xpcshell'),
diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
index 2910e70cd343..c9e21592790e 100644
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -205,7 +205,7 @@ TEST_SUITES = {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
         'kwargs': {'include': []},
-        'task_regex': ['web-platform-tests-crashtests($|.*(-1|[^0-9])$)',
+        'task_regex': ['web-platform-tests-crashtest($|.*(-1|[^0-9])$)',
                        'test-verify-wpt'],
     },
     'web-platform-tests-testharness': {
@@ -219,7 +219,7 @@ TEST_SUITES = {
         'aliases': ('wpt',),
         'mach_command': 'web-platform-tests',
         'kwargs': {'include': []},
-        'task_regex': ['web-platform-tests-reftests($|.*(-1|[^0-9])$)',
+        'task_regex': ['web-platform-tests-reftest($|.*(-1|[^0-9])$)',
                        'test-verify-wpt'],
     },
     'web-platform-tests-wdspec': {
diff --git a/testing/mozbase/moztest/tests/test_resolve.py b/testing/mozbase/moztest/tests/test_resolve.py
index a51393be52e9..5fb25c137cd9 100644
--- a/testing/mozbase/moztest/tests/test_resolve.py
+++ b/testing/mozbase/moztest/tests/test_resolve.py
@@ -330,7 +330,6 @@ def test_task_regexes():
         'test-linux64/opt-robocop-e10s-1',
         'test-linux64/opt-robocop-e10s-11',
         'test-linux64/opt-web-platform-tests-e10s-1',
-        'test-linux64/opt-web-platform-tests-reftests-e10s-1',
         'test-linux64/opt-web-platform-tests-reftest-e10s-1',
         'test-linux64/opt-web-platform-tests-wdspec-e10s-1',
         'test-linux64/opt-web-platform-tests-1',
@@ -378,7 +377,6 @@ def test_task_regexes():
         ],
         'web-platform-tests': [
             'test-linux64/opt-web-platform-tests-e10s-1',
-            'test-linux64/opt-web-platform-tests-reftests-e10s-1',
             'test-linux64/opt-web-platform-tests-reftest-e10s-1',
             'test-linux64/opt-web-platform-tests-wdspec-e10s-1',
             'test-linux64/opt-web-platform-tests-1',
@@ -388,7 +386,7 @@ def test_task_regexes():
             'test-linux64/opt-web-platform-tests-1',
         ],
         'web-platform-tests-reftest': [
-            'test-linux64/opt-web-platform-tests-reftests-e10s-1',
+            'test-linux64/opt-web-platform-tests-reftest-e10s-1',
         ],
         'web-platform-tests-wdspec': [
             'test-linux64/opt-web-platform-tests-wdspec-e10s-1',
diff --git a/testing/mozharness/scripts/web_platform_tests.py b/testing/mozharness/scripts/web_platform_tests.py
index cbe2cfdf744d..177f906c211c 100755
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -277,8 +277,8 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
 
         test_type_suite = {
             "testharness": "web-platform-tests",
-            "crashtest": "web-platform-tests-crashtests",
-            "reftest": "web-platform-tests-reftests",
+            "crashtest": "web-platform-tests-crashtest",
+            "reftest": "web-platform-tests-reftest",
             "wdspec": "web-platform-tests-wdspec",
         }
         for test_type in test_types:
diff --git a/testing/testinfo.py b/testing/testinfo.py
index 473aea10e6f6..d7dbddb2f564 100644
--- a/testing/testinfo.py
+++ b/testing/testinfo.py
@@ -713,14 +713,14 @@ class TestInfoReport(TestInfo):
                                    [{"regex": {"result.test": "/[a-g].*"}},
                                     {"regex": {"result.test": "/[h-p].*"}},
                                     {"not": {"regex": {"result.test": "/[a-p].*"}}}]),
-            "web-platform-tests-reftests": (self.path_mod_wpt,
-                                            [{"regex": {"result.test": "/css/css-.*"}},
-                                             {"not": {"regex": {"result.test": "/css/css-.*"}}}]),
+            "web-platform-tests-reftest": (self.path_mod_wpt,
+                                           [{"regex": {"result.test": "/css/css-.*"}},
+                                            {"not": {"regex": {"result.test": "/css/css-.*"}}}]),
             "crashtest": (None,
                           [{"regex": {"result.test": "[a-g].*"}},
                            {"not": {"regex": {"result.test": "[a-g].*"}}}]),
             "web-platform-tests-wdspec": (self.path_mod_wpt, [None]),
-            "web-platform-tests-crashtests": (self.path_mod_wpt, [None]),
+            "web-platform-tests-crashtest": (self.path_mod_wpt, [None]),
             "xpcshell": (self.path_mod_xpcshell, [None]),
             "mochitest-plain": (None, [None]),
             "mochitest-browser-chrome": (None, [None]),
diff --git a/testing/web-platform/moz.build b/testing/web-platform/moz.build
index 1cfa028485c9..9f28d82d6e7a 100644
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -17,7 +17,7 @@ PYTHON_UNITTEST_MANIFESTS += ['python.ini']
 with Files("**"):
     SCHEDULES.exclusive = [
         'web-platform-tests',
-        'web-platform-tests-reftests',
+        'web-platform-tests-reftest',
         'web-platform-tests-wdspec',
     ]