--- a/testing/marionette/moz.build
+++ b/testing/marionette/moz.build
@@ -4,17 +4,17 @@
 
 DIRS += ["components"]
 
 JAR_MANIFESTS += ["jar.mn"]
 JS_PREFERENCE_FILES += ["prefs/marionette.js"]
 
 MARIONETTE_UNIT_MANIFESTS += ["harness/marionette_harness/tests/unit/unit-tests.ini"]
 MARIONETTE_WEBAPI_MANIFESTS += ["harness/marionette_harness/tests/webapi-tests.ini"]
-XPCSHELL_TESTS_MANIFESTS += ["unit.ini"]
+XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
 
 with Files("**"):
     BUG_COMPONENT = ("Testing", "Marionette")
 
 with Files("harness/**"):
     SCHEDULES.exclusive = ["marionette", "firefox-ui"]
 
 SPHINX_TREES["marionette"] = "doc"

rename from testing/marionette/test_action.js
rename to testing/marionette/test/unit/test_action.js

rename from testing/marionette/test_assert.js
rename to testing/marionette/test/unit/test_assert.js

rename from testing/marionette/test_browser.js
rename to testing/marionette/test/unit/test_browser.js

rename from testing/marionette/test_cookie.js
rename to testing/marionette/test/unit/test_cookie.js

rename from testing/marionette/test_dom.js
rename to testing/marionette/test/unit/test_dom.js

rename from testing/marionette/test_element.js
rename to testing/marionette/test/unit/test_element.js

rename from testing/marionette/test_error.js
rename to testing/marionette/test/unit/test_error.js

rename from testing/marionette/test_evaluate.js
rename to testing/marionette/test/unit/test_evaluate.js

rename from testing/marionette/test_format.js
rename to testing/marionette/test/unit/test_format.js

rename from testing/marionette/test_message.js
rename to testing/marionette/test/unit/test_message.js

rename from testing/marionette/test_navigate.js
rename to testing/marionette/test/unit/test_navigate.js

rename from testing/marionette/test_session.js
rename to testing/marionette/test/unit/test_session.js

rename from testing/marionette/test_sync.js
rename to testing/marionette/test/unit/test_sync.js

rename from testing/marionette/unit.ini
rename to testing/marionette/test/unit/xpcshell.ini