diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_formActionOrigin.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_formActionOrigin.html
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_formActionOrigin.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_formActionOrigin.html
@@ -14,93 +14,78 @@
 
 <script>
 const chromeScript = runChecksAfterCommonInit();
 </script>
 <p id="display"></p>
+
 <!-- we presumably can't hide the content for this test. -->
-<div id="content"></div>
+<div id="content">
+
+  <!-- form1 tests multiple matching logins -->
+  <form id="form1" action="https://autocomplete:8888/formtest.js" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+</div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-function createForm () {
-  const form = document.createElement("form");
-  form.action = "https://autocomplete:8888/formtest.js";
+
+/** Test for Login Manager: multiple login autocomplete. **/
 
-  const usernameInput = document.createElement("input");
-  usernameInput.type = "text";
-  usernameInput.name = "uname";
-  form.appendChild(usernameInput);
-
-  const passwordInput = document.createElement("input");
-  passwordInput.type = "password";
-  passwordInput.name = "pword";
-  form.appendChild(passwordInput);
+const uname = getFormElementByName(1, "uname");
+const pword = getFormElementByName(1, "pword");
 
-  const submitButton = document.createElement("button");
-  submitButton.type = "submit";
-  submitButton.name = "submit";
-  submitButton.innerText = "Submit";
-  form.appendChild(submitButton);
-
-  const content = document.getElementById("content");
-
-  if (content.firstChild) {
-    content.replaceChild(form, content.firstChild);
-  } else {
-    content.appendChild(form);
-  }
-
-  return form;
+// Restore the form to the default state.
+function restoreForm() {
+  uname.value = "";
+  pword.value = "";
+  uname.focus();
 }
 
-/** Test for Login Manager: multiple login autocomplete. **/
+function spinEventLoop() {
+  return Promise.resolve();
+}
 
 add_setup(async () => {
   await addLoginsInParent(
     [window.location.origin, "https://differentFormSubmitURL", null, "dfsu1", "dfsp1", "uname", "pword"]
   );
   listenForUnexpectedPopupShown();
 });
 
 add_task(async function test_form1_initial_empty() {
-  const form = createForm();
-
   await SimpleTest.promiseFocus(window);
 
   // Make sure initial form is empty.
-  checkLoginForm(form.uname, "", form.pword, "");
+  checkLoginForm(uname, "", pword, "");
   const popupState = await getPopupState();
   is(popupState.open, false, "Check popup is initially closed");
 });
 
 /* For this testcase, the only login that exists for this origin
  * is one with a different formActionOrigin, so the login will appear
  * in the autocomplete popup.
  */
 add_task(async function test_form1_menu_shows_logins_for_different_formActionOrigin() {
-  const form = createForm();
-
   await SimpleTest.promiseFocus(window);
-
   // Trigger autocomplete popup
-  form.uname.value = "";
-  form.pword.value = "";
-  form.uname.focus();
-
+  restoreForm();
   const autocompleteItems = await popupByArrowDown();
 
   const popupState = await getPopupState();
   is(popupState.selectedIndex, -1, "Check no entries are selected upon opening");
 
   const expectedMenuItems = ["dfsu1"];
   checkAutoCompleteResults(autocompleteItems, expectedMenuItems, window.location.host, "Check all menuitems are displayed correctly.");
 
   synthesizeKey("KEY_ArrowDown"); // first item
-  checkLoginForm(form.uname, "", form.pword, ""); // value shouldn't update just by selecting
+  checkLoginForm(uname, "", pword, ""); // value shouldn't update just by selecting
 
   synthesizeKey("KEY_Enter");
   await promiseFormsProcessedInSameProcess();
-  checkLoginForm(form.uname, "dfsu1", form.pword, "dfsp1");
+  checkLoginForm(uname, "dfsu1", pword, "dfsp1");
 });
 </script>
 </pre>
 </body>
 </html>