--- a/mail/test/mozmill/content-tabs/test-about-support.js
+++ b/mail/test/mozmill/content-tabs/test-about-support.js
@@ -57,17 +57,17 @@ const ABOUT_SUPPORT_ERROR_STRINGS = new 
 
 /**
  * Opens about:support and waits for it to load.
  *
  * @returns the about:support tab.
  */
 function open_about_support() {
   let tab = open_content_tab_with_click(mc.menus.helpMenu.aboutsupport_open,
-                                        "chrome://messenger/content/about-support/aboutSupport.xhtml");
+                                        "about:support");
   // We have one variable that's asynchronously populated -- wait for it to be
   // populated.
   mc.waitFor(() => (tab.browser.contentWindow.gAccountDetails !== undefined),
              "Timeout waiting for about:support's gAccountDetails to populate.");
 
   return tab;
 }
 

--- a/mail/test/mozmill/downloads/test-about-downloads.js
+++ b/mail/test/mozmill/downloads/test-about-downloads.js
@@ -118,17 +118,17 @@ function setupTest(test) {
 
 function open_about_downloads() {
   let preCount = mc.tabmail.tabContainer.childNodes.length;
   let newTab = mc.tabmail.openTab("chromeTab", { chromePage: "about:downloads",
                                                  clickHandler: "specialTabs.aboutClickHandler(event);" });
   mc.waitFor(() => mc.tabmail.tabContainer.childNodes.length == preCount + 1,
              "Timeout waiting for about:downloads tab");
 
-  wait_for_browser_load(newTab.browser, "chrome://messenger/content/downloads/aboutDownloads.xul");
+  wait_for_browser_load(newTab.browser, "about:downloads");
   // We append new tabs at the end, so check the last one.
   let expectedNewTab = mc.tabmail.tabInfo[preCount];
   return expectedNewTab;
 }
 
 /**
  * Test that there is no file in the list at first.
  */