diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 232f01d0e6cd..f0ca4dc6a283 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -337,12 +337,15 @@ awsy-stylo-sequential:
 # Limited test sets for specific platforms
 
 linux-common-tests:
+    - cppunit
+    - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
     - gtest
     - jittest
     - jsreftest
     - marionette
+    - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
@@ -358,15 +361,12 @@ linux-common-tests:
     - test-verify
     - test-verify-gpu
     - test-verify-wpt
+    - xpcshell
 
-# List of tests that are green on ubuntu1804 docker image.
+# List of tests that are green on ubuntu1804 doker image.
 # See Bug 1602863 for information.
 linux1804-tests:
     - cppunit
-    - crashtest
-    - mochitest
-    - mochitest-gpu
-    - xpcshell
 
 linux-qr-tests:
     - cppunit
diff --git a/tools/tryselect/test/test_fuzzy.py b/tools/tryselect/test/test_fuzzy.py
index b48f1aed0faf..e2a843437fd1 100644
--- a/tools/tryselect/test/test_fuzzy.py
+++ b/tools/tryselect/test/test_fuzzy.py
@@ -13,7 +13,7 @@ import pytest
 @pytest.mark.skipif(os.name == 'nt', reason="fzf not installed on host")
 def test_paths(run_mach, capfd):
     cmd = ['try', 'fuzzy', '--no-push',
-           '-q', "'linux1804-64/opt-xpcshell", 'caps/tests/unit/test_origin.js']
+           '-q', "'linux64/opt-xpcshell", 'caps/tests/unit/test_origin.js']
     assert run_mach(cmd) == 0
 
     output = capfd.readouterr().out
@@ -23,7 +23,7 @@ def test_paths(run_mach, capfd):
     # with the path filtering.
     expected = """
     "tasks": [
-        "test-linux1804-64/opt-xpcshell-e10s-1"
+        "test-linux64/opt-xpcshell-e10s-1"
     ]""".lstrip()
 
     assert expected in output