--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -391,16 +391,26 @@ MOCHITEST_DT = [
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite', 'mochitest-devtools-chrome'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
 
+MOCHITEST_DT_E10S = [
+    ('mochitest-e10s-devtools-chrome', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'mochitest-devtools-chrome', '--e10s'],
+        'blob_upload': True,
+        'script_maxtime': 7200,
+    }),
+]
+
 MOCHITEST_DT_3 = [
     ('mochitest-devtools-chrome', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--mochitest-suite', 'mochitest-devtools-chrome-chunked'],
         'blob_upload': True,
         'script_maxtime': 4800,
         'totalChunks': 3,
@@ -505,16 +515,32 @@ REFTEST_IPC = [
     ('crashtest-ipc', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--reftest-suite', 'crashtest-ipc'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
+REFTEST_E10S = [
+    ('reftest-e10s', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'reftest', '--e10s'],
+        'blob_upload': True,
+        'script_maxtime': 7200,
+    }),
+    ('crashtest-e10s', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'crashtest', '--e10s'],
+        'blob_upload': True,
+        'script_maxtime': 7200,
+    }),
+]
 
 XPCSHELL = [
     ('xpcshell', {
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--xpcshell-suite', 'xpcshell'],
         'blob_upload': True,
         'script_maxtime': 7200,
@@ -631,34 +657,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -712,34 +747,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -793,34 +837,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -871,34 +924,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/linux_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/linux_unittest.py"],
@@ -954,34 +1016,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-omtc': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1032,34 +1103,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-omtc': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1110,34 +1190,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-omtc': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1199,34 +1288,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/win_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/win_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/win_unittest.py"],
@@ -1279,34 +1377,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/mac_unittest.py"],
@@ -1351,34 +1458,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/mac_unittest.py"],
@@ -1423,34 +1539,43 @@ PLATFORM_UNITTEST_VARS = {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'mochitest-other': {
                     '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"],
                 },
                 'mochitest-jetpack': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'webapprt-chrome': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'reftest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'reftest-e10s': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'jsreftest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'crashtest': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
+                'crashtest-e10s': {
+                    'config_files': ["unittests/mac_unittest.py"],
+                },
                 'reftest-no-accel': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'reftest-ipc': {
                     'config_files': ["unittests/mac_unittest.py"],
                 },
                 'crashtest-ipc': {
                     'config_files': ["unittests/mac_unittest.py"],
@@ -1881,32 +2006,34 @@ for platform in PLATFORMS.keys():
     for slave_platform in PLATFORMS[platform]['slave_platforms']:
         if slave_platform not in BRANCHES['cedar']['platforms'][platform]:
             continue
         BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_JP[:]
         BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOCHITEST_JP[:]
 
 # Enable e10s Linux mochitests on trunk branches
 # Enable e10s browser-chrome mochitests on trunk branches, opt builds only for all platforms (not ready for Xp).
+# Enable e10s devtools tests for Linux opt on trunk branches
 # Fix this to a certain gecko version once e10s starts riding the trains
 mc_gecko_version = BRANCHES['mozilla-central']['gecko_version']
 for name, branch in items_at_least(BRANCHES, 'gecko_version', mc_gecko_version):
     if name == "holly": # On Holly we use normal mochitest as e10s ones
         continue
     for platform in PLATFORMS.keys():
         if platform not in branch['platforms']:
             continue
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if platform in branch['platforms'] and slave_platform in branch['platforms'][platform] and \
                     not slave_platform == 'xp-ix':
                 branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_BC_3_E10S[:]
             if platform in ('linux', 'linux64', 'linux64-asan'):
                 branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_E10S[:]
             if platform in ('linux', 'linux64'):
                 branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOCHITEST_E10S[:]
+                branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_DT_E10S[:]
 
 # Bug 1080134: we want to disable all 32-bit testing on win8 for gecko 36 and
 # higher, and enable 64-bit tests on win8 instead.
 # Disable 64-bit win8 testing on gecko 35 and lower
 for name, branch in items_before(BRANCHES, 'gecko_version', 36):
     if 'win64' in branch['platforms']:
         del branch['platforms']['win64']
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 36):