--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -12,17 +12,16 @@ support-files =
   subtst_notifications_11.html
   subtst_notifications_11_popup.html
   subtst_privbrowsing_1.html
   subtst_privbrowsing_2.html
   subtst_privbrowsing_3.html
   subtst_privbrowsing_4.html
   subtst_prompt_async.html
 
-[test_basic_form_2pw_2.html]
 [test_master_password.html]
 skip-if = toolkit == 'android' # Bug 1258975 on android.
 [test_master_password_cleanup.html]
 skip-if = toolkit == 'android' # Bug 1258975 on android.
 [test_notifications_popup.html]
 skip-if = true || os == "linux" || toolkit == 'android' # bug 934057. Bug 1258975 on android.
 [test_prompt.html]
 skip-if = os == "linux" || toolkit == 'android' # Bug 1258975 on android.

--- a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
@@ -8,16 +8,17 @@ support-files =
   auth2/authenticate.sjs
 
 [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' || e10s # android:autocomplete. e10s:Requires code fix in bug 1258921.
 [test_basic_form_html5.html]
 [test_basic_form_pwevent.html]
 [test_basic_form_pwonly.html]
 [test_bug_627616.html]
 skip-if = toolkit == 'android' # Bug 1258975 on android.

rename from toolkit/components/passwordmgr/test/test_basic_form_2pw_2.html
rename to toolkit/components/passwordmgr/test/mochitest/test_basic_form_2pw_2.html
--- a/toolkit/components/passwordmgr/test/test_basic_form_2pw_2.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_basic_form_2pw_2.html
@@ -81,49 +81,26 @@ function getFormSubmitButton(formNum) {
   // invoke the form onsubmit handler.
   var button = form.firstChild;
   while (button && button.type != "submit") { button = button.nextSibling; }
   ok(button != null, "getting form submit button");
 
   return button;
 }
 
-
-// Counts the number of logins currently stored by password manager.
-function countLogins() {
-  var logins = pwmgr.getAllLogins();
-
-  return logins.length;
-}
-
-commonInit();
+runChecksAfterCommonInit(startTest)
 
-// Get the pwmgr service
-var Cc_pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"];
-ok(Cc_pwmgr != null, "Access Cc[@mozilla.org/login-manager;1]");
-
-var Ci_pwmgr = SpecialPowers.Ci.nsILoginManager;
-ok(Ci_pwmgr != null, "Access Ci.nsILoginManager");
-
-var pwmgr = Cc_pwmgr.getService(Ci_pwmgr);
-ok(pwmgr != null, "pwmgr getService()");
-
-
-window.addEventListener("runTests", startTest);
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 <div id="content" style="display: none">
   <form id="form1" onsubmit="return checkSubmit(1)" action="http://newuser.com">
     <input  type="text"     name="uname">
     <input  type="password" name="pword">
     <input  type="password" name="qword">
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset </button>
   </form>
 
 </div>
 
 </body>
 </html>
-