--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -1,1 +1,2 @@
 comm.pth:comm/taskcluster
+comm.pth:comm/testing/marionette

--- a/mail/moz.build
+++ b/mail/moz.build
@@ -16,11 +16,11 @@ DIRS += [
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 if CONFIG['MOZ_BUNDLED_FONTS']:
     DIRS += ['/%s/browser/fonts' % CONFIG['mozreltopsrcdir']]
 
-TEST_DIRS += ['test/mozmill']
+TEST_DIRS += ['test/mozmill', 'test/marionette']
 
 FINAL_TARGET_FILES.defaults += ['app/permissions']

--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -13,16 +13,17 @@ kind-dependencies:
 transforms:
     - taskgraph.transforms.tests:transforms
     - comm_taskgraph:tests_drop_1proc
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 jobs-from:
     - tests.yml
+    - marionette.yml
 
 # These apply to all included test yml files listed in jobs-from
 job-defaults:
     when:
         files-changed:
             # Include everything in comm-central except suite/
             # https://bugzilla.mozilla.org/show_bug.cgi?id=1422060
             - comm/build

--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -17,76 +17,87 @@
 
 # Linux platforms (matching /linux.*/)
 
 linux64/opt:
     build-platform: linux64/opt
     test-sets:
         - common-tests
         - optimized-tests
+        - marionette-tests
 
 linux64-shippable/opt:
     build-platform: linux64-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
+        - marionette-tests
 
 linux64/debug:
     build-platform: linux64/debug
     test-sets:
         - common-tests
+        - marionette-tests
 
 linux32-shippable/opt:
     build-platform: linux-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
+        - marionette-tests
 
 linux32/debug:
     build-platform: linux/debug
     test-sets:
         - common-tests
+        - marionette-tests
 
 # Windows platforms (matching /windows.*/)
 
 # win32
 windows7-32/opt:
     build-platform: win32/opt
     test-sets:
         - common-tests
         - optimized-tests
+        - marionette-tests
 
 windows7-32-shippable/opt:
     build-platform: win32-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
+        - marionette-tests
 
 windows7-32/debug:
     build-platform: win32/debug
     test-sets:
         - common-tests
+        - marionette-tests
 
 # win64
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - common-tests
         - optimized-tests
+        - marionette-tests
 
 windows10-64-shippable/opt:
     build-platform: win64-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
+        - marionette-tests
 
 windows10-64/debug:
     build-platform: win64/debug
     test-sets:
         - common-tests
+        - marionette-tests
 
 # MacOS X platforms (matching /macosx.*/)
 
 macosx1010-64/debug:
     build-platform: macosx64/debug
     test-sets:
         - common-tests
 

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -20,8 +20,12 @@
 # a few add-on test sets that are included or omitted on some platforms.
 
 common-tests:
     - xpcshell
     - mozmill
 
 optimized-tests:
     - mochitest-thunderbird
+
+marionette-tests:
+    - marionette
+    - marionette-headless