diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index 92609be2f377..41ae8ae0fd0c 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1445,6 +1445,26 @@ VARIABLES = {
         """List of manifest files defining Android instrumentation tests.
         """),
 
+    'MARIONETTE_LAYOUT_MANIFESTS': (StrictOrderingOnAppendList, list,
+        """List of manifest files defining marionette-layout tests.
+        """),
+
+    'MARIONETTE_LOOP_MANIFESTS': (StrictOrderingOnAppendList, list,
+        """List of manifest files defining marionette-loop tests.
+        """),
+
+    'MARIONETTE_UNIT_MANIFESTS': (StrictOrderingOnAppendList, list,
+        """List of manifest files defining marionette-unit tests.
+        """),
+
+    'MARIONETTE_UPDATE_MANIFESTS': (StrictOrderingOnAppendList, list,
+        """List of manifest files defining marionette-update tests.
+        """),
+
+    'MARIONETTE_WEBAPI_MANIFESTS': (StrictOrderingOnAppendList, list,
+        """List of manifest files defining marionette-webapi tests.
+        """),
+
     'METRO_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list,
         """List of manifest files defining metro browser chrome tests.
         """),
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 27ad06c9509f..887cf9d68eb4 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -1034,7 +1034,6 @@ class TreeMetadataEmitter(LoggingMixin):
                     else 'USE_LIBS'))
 
     def _process_test_manifests(self, context):
-
         for prefix, info in TEST_MANIFESTS.items():
             for path in context.get('%s_MANIFESTS' % prefix, []):
                 for obj in self._process_test_manifest(context, info, path):
diff --git a/python/mozbuild/mozbuild/testing.py b/python/mozbuild/mozbuild/testing.py
index 5811417f5909..23b36203fdf5 100644
--- a/python/mozbuild/mozbuild/testing.py
+++ b/python/mozbuild/mozbuild/testing.py
@@ -260,6 +260,15 @@ TEST_MANIFESTS = dict(
     ANDROID_INSTRUMENTATION=('instrumentation', 'instrumentation', '.', False),
     JETPACK_PACKAGE=('jetpack-package', 'testing/mochitest', 'jetpack-package', True),
     JETPACK_ADDON=('jetpack-addon', 'testing/mochitest', 'jetpack-addon', False),
+
+    # marionette tests are run from the srcdir
+    # TODO(ato): make packaging work as for other test suites
+    MARIONETTE=('marionette', 'marionette', '.', False),
+    MARIONETTE_LOOP=('marionette', 'marionette', '.', False),
+    MARIONETTE_UNIT=('marionette', 'marionette', '.', False),
+    MARIONETTE_UPDATE=('marionette', 'marionette', '.', False),
+    MARIONETTE_WEBAPI=('marionette', 'marionette', '.', False),
+
     METRO_CHROME=('metro-chrome', 'testing/mochitest', 'metro', True),
     MOCHITEST=('mochitest', 'testing/mochitest', 'tests', True),
     MOCHITEST_CHROME=('chrome', 'testing/mochitest', 'chrome', True),