--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -2,17 +2,17 @@
 # vim: set filetype=python:
 # 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/.
 
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini', 'test/mochitest/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome/chrome.ini']
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 TESTING_JS_MODULES += [
     # Make this file available from the "resource:" URI of the test environment.
     'test/browser/form_basic.html',
     'test/LoginTestUtils.jsm',

--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -66,16 +66,14 @@ skip-if = toolkit == 'android'
 skip-if = toolkit == 'android'
 [test_notifications_popup.html]
 skip-if = os == "linux" || toolkit == 'android' # bug 934057
 [test_passwords_in_type_password.html]
 [test_prompt.html]
 skip-if = os == "linux" || toolkit == 'android' #TIMED_OUT
 [test_prompt_async.html]
 skip-if = toolkit == 'android' #TIMED_OUT
-[test_recipe_login_fields.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [test_xhr.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_xhr_2.html]
 [test_xml_load.html]
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_zzz_finish.html]

copy from toolkit/components/passwordmgr/test/mochitest.ini
copy to toolkit/components/passwordmgr/test/mochitest/mochitest.ini
--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
@@ -1,81 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || e10s
+skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files =
-  authenticate.sjs
-  blank.html
-  formsubmit.sjs
-  notification_common.js
-  privbrowsing_perwindowpb_iframe.html
-  prompt_common.js
-  pwmgr_common.js
-  subtst_master_pass.html
-  subtst_notifications_1.html
-  subtst_notifications_10.html
-  subtst_notifications_11.html
-  subtst_notifications_11_popup.html
-  subtst_notifications_2.html
-  subtst_notifications_2pw_0un.html
-  subtst_notifications_2pw_1un_1text.html
-  subtst_notifications_3.html
-  subtst_notifications_4.html
-  subtst_notifications_5.html
-  subtst_notifications_6.html
-  subtst_notifications_7.html
-  subtst_notifications_8.html
-  subtst_notifications_9.html
-  subtst_privbrowsing_1.html
-  subtst_privbrowsing_2.html
-  subtst_privbrowsing_3.html
-  subtst_privbrowsing_4.html
-  subtst_prompt_async.html
-  auth2/authenticate.sjs
+  ../pwmgr_common.js
 
-[test_autofill_before_load.html]
-# This test doesn't pass because we can't ensure a cross-platform event that
-# occurs between DOMContentLoaded and Pageload
-skip-if = true
-[test_autofill_password-only.html]
-[test_basic_form.html]
-[test_basic_form_0pw.html]
-[test_basic_form_1pw.html]
-[test_basic_form_1pw_2.html]
-[test_basic_form_2pw_1.html]
-[test_basic_form_2pw_2.html]
-[test_basic_form_3pw_1.html]
-[test_basic_form_autocomplete.html]
-skip-if = toolkit == 'android'
-[test_case_differences.html]
-skip-if = toolkit == 'android'
-[test_basic_form_html5.html]
-[test_basic_form_pwevent.html]
-[test_basic_form_pwonly.html]
-[test_bug_627616.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_bug_776171.html]
-[test_form_action_1.html]
-[test_form_action_2.html]
-[test_form_action_javascript.html]
-[test_input_events.html]
-[test_input_events_for_identical_values.html]
-[test_master_password.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_master_password_cleanup.html]
-skip-if = toolkit == 'android'
-[test_maxlength.html]
-[test_notifications.html]
-skip-if = toolkit == 'android'
-[test_notifications_popup.html]
-skip-if = os == "linux" || toolkit == 'android' # bug 934057
-[test_passwords_in_type_password.html]
-[test_prompt.html]
-skip-if = os == "linux" || toolkit == 'android' #TIMED_OUT
-[test_prompt_async.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_recipe_login_fields.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
-[test_xhr.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_xhr_2.html]
-[test_xml_load.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_zzz_finish.html]

rename from toolkit/components/passwordmgr/test/test_recipe_login_fields.html
rename to toolkit/components/passwordmgr/test/mochitest/test_recipe_login_fields.html