--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -598,16 +598,37 @@ MOCHITEST_OTHER = [
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite', 'chrome,a11y'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
 
+MOCHITEST_A11Y   = [
+    ('mochitest-a11y', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'a11y'],
+        'blob_upload': True,
+        'script_maxtime': 1800,
+    }),
+]
+
+MOCHITEST_CHROME = [
+    ('mochitest-chrome', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'chrome-chunked'],
+        'blob_upload': True,
+        'script_maxtime': 7200,
+        'totalChunks': 3,
+    }),
+]
+
 MOCHITEST_PUSH = [
     ('mochitest-push', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite', 'mochitest-push'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
@@ -878,16 +899,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -986,16 +1013,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -1099,16 +1132,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -1208,16 +1247,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -1317,16 +1362,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -1430,16 +1481,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-browser-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1532,16 +1589,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1637,16 +1700,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1753,16 +1822,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1954,16 +2029,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/mac_unittest.py"],
@@ -2048,16 +2129,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/mac_unittest.py"],
@@ -2145,16 +2232,22 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-e10s-browser-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-other': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'mochitest-a11y': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
+                'mochitest-chrome': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'mochitest-devtools-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-e10s-devtools-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-gl': {
                     'config_files': ["unittests/mac_unittest.py"],
@@ -2527,16 +2620,34 @@ for platform in PLATFORMS.keys():
             if slave_platform == "snowleopard":
                 continue
 
             if platform in BRANCHES[name]['platforms']:
                 if slave_platform in BRANCHES[name]['platforms'][platform]:
                     BRANCHES[name]['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
                         WEB_PLATFORM_TESTS_CHUNKED_MORE + WEB_PLATFORM_REFTESTS
 
+### Tests Enabled in Gecko 44+ ###
+# mochitest a11y/chrome instead of other
+for platform in PLATFORMS.keys():
+    if platform not in ['linux']:
+        continue
+
+    for name, branch in items_at_least(BRANCHES, 'gecko_version', 44):
+        for test_platform in PLATFORMS[platform]['slave_platforms']:
+
+            platforms = BRANCHES[name]['platforms']
+            if platform in platforms:
+                if test_platform in platforms[platform]:
+                    platforms[platform][test_platform]['debug_unittest_suites'] += MOCHITEST_A11Y
+                    platforms[platform][test_platform]['debug_unittest_suites'] += MOCHITEST_CHROME
+                    for item in platforms[platform][test_platform]['debug_unittest_suites']:
+                        if item[0] == 'mochitest-other':
+                            platforms[platform][test_platform]['debug_unittest_suites'].remove(item)
+
 ### Tests Enabled in Gecko 43+ ###
 
 # Starting in Firefox 44:
 #   Enable e10s Linux mochitests
 #   Enable e10s browser-chrome mochitests, opt builds only for all platforms (not ready for Xp).
 #   Enable e10s devtools tests for Linux opt
 #   Enable e10s reftests/crashtests for Linux opt
 #   Enable e10s marionette tests for Linux32 opt