--- a/taskcluster/ci/android-test/test-sets.yml
+++ b/taskcluster/ci/android-test/test-sets.yml
@@ -8,16 +8,18 @@
 # A test set has a name, and a list of tests that it contains.
 #
 # Test names given here reference tests.yml.
 
 debug-tests:
     - cppunit
     - crashtest
     - jsreftest
+    # Marionette only available on Fennec debug builds as a security precaution
+    - marionette
     - mochitest
     - mochitest-chrome
     - mochitest-clipboard
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl
     - reftest
     - xpcshell

--- a/taskcluster/ci/android-test/tests.yml
+++ b/taskcluster/ci/android-test/tests.yml
@@ -63,16 +63,36 @@ jsreftest:
         no-read-buildbot-config: true
         config:
             - mozharness/configs/android/androidarm_4_3.py
             - mozharness/configs/remove_executables.py
             - mozharness/configs/android/androidarm_4_3-tc.py
         extra-options:
             - --test-suite=jsreftest
 
+marionette:
+    description: "Marionette unittest run"
+    suite: marionette
+    treeherder-symbol: tc(Mn)
+    chunks: 10
+    instance-size: xlarge
+    loopback-video: true
+    e10s: false
+    tier: 3
+    max-run-time: 3600
+    mozharness:
+        script: mozharness/scripts/android_emulator_unittest.py
+        no-read-buildbot-config: true
+        config:
+            - mozharness/configs/android/androidarm_4_3.py
+            - mozharness/configs/remove_executables.py
+            - mozharness/configs/android/androidarm_4_3-tc.py
+        extra-options:
+            - --test-suite=marionette
+
 mochitest:
     description: "Mochitest plain run"
     suite: mochitest/plain-chunked
     treeherder-symbol: tc-M()
     instance-size: xlarge
     chunks: 20
     loopback-video: true
     e10s: false