--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -26,20 +26,30 @@ def alias_prefix(prefix):
 def alias_contains(infix):
     return lambda name: infix in name
 
 def alias_matches(pattern):
     pattern = re.compile(pattern)
     return lambda name: pattern.match(name)
 
 UNITTEST_ALIASES = {
+    # Aliases specify shorthands that can be used in try syntax.  The shorthand
+    # is the dictionary key, with the value representing a pattern for matching
+    # unittest_try_names.
+    #
+    # Note that alias expansion is performed in the absence of any chunk
+    # prefixes.  For example, the first example above would replace "foo-7"
+    # with "foobar-7".  Note that a few aliases allowed chunks to be specified
+    # without a leading `-`, for example 'mochitest-dt1'. That's no longer
+    # supported.
     'cppunit': alias_prefix('cppunit'),
     'crashtest': alias_prefix('crashtest'),
     'crashtest-e10s': alias_prefix('crashtest-e10s'),
     'e10s': alias_contains('e10s'),
+    'external-media-tests': alias_prefix('external-media-tests'),
     'firefox-ui-functional': alias_prefix('firefox-ui-functional'),
     'firefox-ui-functional-e10s': alias_prefix('firefox-ui-functional-e10s'),
     'gaia-js-integration': alias_contains('gaia-js-integration'),
     'gtest': alias_prefix('gtest'),
     'jittest': alias_prefix('jittest'),
     'jittests': alias_prefix('jittest'),
     'jsreftest': alias_prefix('jsreftest'),
     'jsreftest-e10s': alias_prefix('jsreftest-e10s'),
@@ -56,16 +66,20 @@ UNITTEST_ALIASES = {
     'mochitest-bc-e10s': alias_prefix('mochitest-browser-chrome-e10s'),
     'mochitest-browser-chrome': alias_prefix('mochitest-browser-chrome'),
     'mochitest-browser-chrome-e10s': alias_prefix('mochitest-browser-chrome-e10s'),
     'mochitest-chrome': alias_contains('mochitest-chrome'),
     'mochitest-dt': alias_prefix('mochitest-devtools-chrome'),
     'mochitest-dt-e10s': alias_prefix('mochitest-devtools-chrome-e10s'),
     'mochitest-gl': alias_prefix('mochitest-webgl'),
     'mochitest-gl-e10s': alias_prefix('mochitest-webgl-e10s'),
+    'mochitest-gpu': alias_prefix('mochitest-gpu'),
+    'mochitest-gpu-e10s': alias_prefix('mochitest-gpu-e10s'),
+    'mochitest-clipboard': alias_prefix('mochitest-clipboard'),
+    'mochitest-clipboard-e10s': alias_prefix('mochitest-clipboard-e10s'),
     'mochitest-jetpack': alias_prefix('mochitest-jetpack'),
     'mochitest-media': alias_prefix('mochitest-media'),
     'mochitest-media-e10s': alias_prefix('mochitest-media-e10s'),
     'mochitest-vg': alias_prefix('mochitest-valgrind'),
     'reftest': alias_matches(r'^(plain-)?reftest.*$'),
     'reftest-no-accel': alias_matches(r'^(plain-)?reftest-no-accel.*$'),
     'reftests': alias_matches(r'^(plain-)?reftest.*$'),
     'reftests-e10s': alias_matches(r'^(plain-)?reftest-e10s.*$'),

--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -1,88 +1,12 @@
 ---
 # List of all possible flags for each category of tests used in the case where
 # "all" is specified.
 flags:
-  aliases:
-    # Aliases specify shorthands that can be used in try syntax.  An alias can
-    # specify a simple replacement:
-    #   fb: foobar  -- replaces fb with foobar
-    #
-    # or an expansion into several test suites (which cannot themselves be
-    # aliases):
-    #   footests:
-    #     - foo
-    #     - bar
-    #     - bing
-    #
-    # or a pattern or patterns (identified by leading and trailing /) that
-    # will be matched against the available flags
-    #   dt: /devtools.*/
-    #   footests:
-    #     - browser-foo
-    #     - /foo.*/   -- selects all defined flags starting with "foo"
-    #
-    # Note that alias expansion is performed in the absence of any chunk
-    # prefixes.  For example, the first example above would replace "foo-7"
-    # with "foobar-7".  Note that a few aliases allowed chunks to be specified
-    # without a leading `-`, for example 'mochitest-dt1'. That's no longer
-    # supported.
-    cppunit: /cppunit.*/
-    crashtest: /crashtest.*/
-    crashtest-e10s: /crashtest-e10s.*/
-    e10s: /.*e10s.*/
-    external-media-tests: /external-media-tests.*/
-    firefox-ui-functional: /firefox-ui-functional.*/
-    firefox-ui-functional-e10s: /firefox-ui-functional-e10s.*/
-    gaia-js-integration: /.*gaia-js-integration.*/
-    gtest: /gtest.*/
-    jittest: /jittest.*/
-    jittests: /jittest.*/
-    jsreftest: /jsreftest.*/
-    jsreftest-e10s: /jsreftest-e10s.*/
-    luciddream: /luciddream.*/
-    marionette: /marionette.*/
-    marionette-e10s: /marionette-e10s.*/
-    mochitest: /mochitest.*/
-    mochitests: /mochitest.*/
-    mochitest-e10s: /mochitest-e10s.*/
-    mochitests-e10s: /mochitest-e10s.*/
-    mochitest-debug: /mochitest-debug-.*/
-    mochitest-a11y: /.*mochitest-a11y.*/
-    mochitest-bc: /mochitest-browser-chrome.*/
-    mochitest-bc-e10s: /mochitest-browser-chrome-e10s.*/
-    mochitest-browser-chrome: /mochitest-browser-chrome.*/
-    mochitest-browser-chrome-e10s: /mochitest-browser-chrome-e10s.*/
-    mochitest-chrome: /.*mochitest-chrome.*/
-    mochitest-dt: /mochitest-devtools-chrome.*/
-    mochitest-dt-e10s: /mochitest-devtools-chrome-e10s.*/
-    mochitest-gl: /mochitest-webgl.*/
-    mochitest-gl-e10s: /mochitest-webgl-e10s.*/
-    mochitest-gpu: /mochitest-gpu.*/
-    mochitest-gpu-e10s: /mochitest-gpu-e10s.*/
-    mochitest-clipboard: /mochitest-clipboard.*/
-    mochitest-clipboard-e10s: /mochitest-clipboard-e10s.*/
-    mochitest-jetpack: /mochitest-jetpack.*/
-    mochitest-media: /mochitest-media.*/
-    mochitest-media-e10s: /mochitest-media-e10s.*/
-    mochitest-vg: /mochitest-valgrind.*/
-    reftest: /(plain-)?reftest.*/
-    reftest-no-accel: /(plain-)?reftest-no-accel.*/
-    reftests: /(plain-)?reftest.*/
-    reftests-e10s: /(plain-)?reftest-e10s.*/
-    reftest-no-accel-e10s: /(plain-)?reftest-no-accel-e10s.*/
-    robocop: /robocop.*/
-    web-platform-test: /web-platform-tests.*/
-    web-platform-tests: /web-platform-tests.*/
-    web-platform-tests-e10s: /web-platform-tests-e10s.*/
-    web-platform-tests-reftests: /web-platform-tests-reftests.*/
-    web-platform-tests-reftests-e10s: /web-platform-tests-reftests-e10s.*/
-    xpcshell: /xpcshell.*/
-
   builds:
     - linux32_gecko  # b2g desktop linux 32 bit
     - linux64_gecko  # b2g desktop linux 64 bit
     - linux64-mulet  # Firefox desktop - b2g gecko linux 64 bit
     - linux64-haz    # Firefox desktop browser, rooting hazard analysis
     - linux64-shell-haz  # JS shell, rooting hazard analysis
     - linux64-mulet-haz  # Firefox desktop - b2g gecko linux 64 bit, rooting hazard analysis
     - macosx64_gecko # b2g desktop osx 64 bit