diff --git a/calendar/test/mozmill/shared-modules/test-calendar-utils.js b/calendar/test/mozmill/shared-modules/test-calendar-utils.js
index 90435dde09..93e700c06e 100755
--- a/calendar/test/mozmill/shared-modules/test-calendar-utils.js
+++ b/calendar/test/mozmill/shared-modules/test-calendar-utils.js
@@ -542,7 +542,7 @@ function handleNewCalendarWizard(wizard, name, data = undefined) {
         }
         wizard.type(wizardlookup(`
             /id("calendar-wizard")/{"pageid":"locationPage"}/[1]/[1]/{"align":"center"}/
-            id("calendar-uri")/anon({"anonid":"moz-input-box"})/anon({"anonid":"input"})
+            id("calendar-uri")/{"class":"textbox-input"}
         `), data.network.location);
 
         // Choose offline support.
diff --git a/calendar/test/mozmill/testLocalICS.js b/calendar/test/mozmill/testLocalICS.js
index c9e4b3d11d..fef9318c79 100755
--- a/calendar/test/mozmill/testLocalICS.js
+++ b/calendar/test/mozmill/testLocalICS.js
@@ -44,7 +44,6 @@ function setupModule(module) {
     calendarFile.append(calendarName + ".ics");
 }
 
-testLocalICS.__force_skip__ = true;  // See bug 1534913.
 function testLocalICS() {
     plan_for_modal_dialog("Calendar:NewCalendarWizard", (wizard) => {
         handleNewCalendarWizard(wizard, calendarName, { network: { format: "ics" } });
diff --git a/mail/test/mozmill/quick-filter-bar/test-keyboard-interface.js b/mail/test/mozmill/quick-filter-bar/test-keyboard-interface.js
index bc783c4987..123db2ecba 100644
--- a/mail/test/mozmill/quick-filter-bar/test-keyboard-interface.js
+++ b/mail/test/mozmill/quick-filter-bar/test-keyboard-interface.js
@@ -126,7 +126,6 @@ function test_escape_does_not_reach_us_from_gloda_search() {
  * Control-shift-k expands the quick filter bar when it's collapsed. When
  * already expanded, it focuses the text box and selects its text.
  */
-test_control_shift_k_shows_quick_filter_bar.__force_skip__ = true;  // See bug 1534913.
 function test_control_shift_k_shows_quick_filter_bar() {
   let dispatcha = mc.window.document.commandDispatcher;
   let qfbTextbox = mc.e("qfb-qs-textbox");
@@ -148,8 +147,8 @@ function test_control_shift_k_shows_quick_filter_bar() {
   if (dispatcha.focusedElement != qfbTextbox.inputField)
     throw new Error("second control-shift-k did not keep focus on filter " +
                     "textbox");
-  if (qfbTextbox.selectionStart != 0 ||
-      qfbTextbox.selectionEnd != qfbTextbox.textLength)
+  if (qfbTextbox.inputField.selectionStart != 0 ||
+      qfbTextbox.inputField.selectionEnd != qfbTextbox.inputField.textLength)
     throw new Error("second control-shift-k did not select text in filter " +
                     "textbox");