--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -467,36 +467,16 @@ MOCHITEST_WO_BC_10 = [
         'extra_args': ['--mochitest-suite', 'plain-chunked'],
         'blob_upload': True,
         'script_maxtime': 7200,
         'totalChunks': 10,
     }),
 ]
 
 ### Mochitest (Other Miscellaneous Suites) ###
-MOCHITEST_JP = [
-    ('mochitest-jetpack', {
-        'use_mozharness': True,
-        'script_path': 'scripts/desktop_unittest.py',
-        'extra_args': ['--mochitest-suite', 'jetpack-package', '--mochitest-suite', 'jetpack-addon'],
-        'blob_upload': True,
-        'script_maxtime': 12000,
-    }),
-]
-
-MOCHITEST_OTHER = [
-    ('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,
     }),
@@ -508,16 +488,26 @@ MOCHITEST_CHROME = [
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite', 'chrome-chunked'],
         'blob_upload': True,
         'script_maxtime': 7200,
         'totalChunks': 3,
     }),
 ]
 
+MOCHITEST_JP = [
+    ('mochitest-jetpack', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'jetpack-package', '--mochitest-suite', 'jetpack-addon'],
+        'blob_upload': True,
+        'script_maxtime': 12000,
+    }),
+]
+
 MOCHITEST_MEDIA = [
     ('mochitest-media', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite', 'mochitest-media'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
@@ -607,18 +597,18 @@ MOCHITEST_CLIPBOARD_E10S = [
                        'plain-clipboard,chrome-clipboard,browser-chrome-clipboard,jetpack-package-clipboard',
                        '--e10s'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
 
 ### Mochitest Combinations ###
-MOCHITEST_5 = MOCHITEST_WO_BC + MOCHITEST_OTHER
-MOCHITEST_10 = MOCHITEST_WO_BC_10 + MOCHITEST_OTHER
+MOCHITEST_5 = MOCHITEST_WO_BC + MOCHITEST_A11Y + MOCHITEST_CHROME
+MOCHITEST_10 = MOCHITEST_WO_BC_10 + MOCHITEST_A11Y + MOCHITEST_CHROME
 
 ### Mozbase ###
 MOZBASE = [
     ('mozbase', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mozbase-suite', 'mozbase'],
         'script_maxtime': 7200,
@@ -2504,34 +2494,16 @@ 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+ ###
 
 # Enable e10s tests for Gecko 46+ on all eligible platforms
 trunk_gecko_version = BRANCHES['mozilla-central']['gecko_version']
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
     for platform in PLATFORMS.keys():
         if platform not in branch['platforms']:
             continue