--- a/testing/marionette/moz.build
+++ b/testing/marionette/moz.build
@@ -1,10 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ["components", "atoms"]
 
 JAR_MANIFESTS += ["jar.mn"]
+XPCSHELL_TESTS_MANIFESTS += ["unit.ini"]
 
 with Files("**"):
     BUG_COMPONENT = ("Testing", "Marionette")

new file mode 100644
--- /dev/null
+++ b/testing/marionette/unit.ini
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# xpcshell unit tests for Marionette
+
+[DEFAULT]
+head =
+tail =
+
+[test_error.js]
+[test_message.js]