--- a/mail/test/mozmill/content-tabs/test-content-tab.js
+++ b/mail/test/mozmill/content-tabs/test-content-tab.js
@@ -60,17 +60,19 @@ function test_spellcheck_in_content_tabs
   let w = tabmail.selectedTab.browser.contentWindow;
   let textarea = w.document.querySelector("textarea");
   let eidMailContext = mc.eid("mailContext");
 
   // Test a few random items
   mc.click(new elementslib.Elem(textarea));
   // Bug 364914 causes textareas to not be spell checked until they have been
   // focused at last once, so give the event loop a chance to spin.
-  mc.sleep(0);
+  // Since bug 1370754 the inline spell checker waits 1 second, so let's
+  // wait 2 seconds to be on the safe side.
+  mc.sleep(2000);
   mc.rightClick(new elementslib.Elem(textarea));
   assert_element_visible("mailContext-spell-dictionaries");
   assert_element_visible("mailContext-spell-check-enabled");
   assert_element_not_visible("mailContext-replySender"); // we're in a content tab!
   close_popup(mc, eidMailContext);
 
   // Different test
   mc.rightClick(new elementslib.Elem(w.document.body.firstElementChild));
@@ -88,18 +90,16 @@ function test_spellcheck_in_content_tabs
 
   // Now check we don't have any suggestionss
   EventUtils.synthesizeMouse(textarea, 5, 5,
                              {type: "contextmenu", button: 2}, w);
   suggestions = mc.window.document.getElementsByClassName("spell-suggestion");
   assert_true(suggestions.length == 0, "But I just taught you this word!");
   close_popup(mc, eidMailContext);
 }
-// XXX Currently the spellcheck test has focus issues on non-Mac
-test_spellcheck_in_content_tabs.EXCLUDED_PLATFORMS = ['winnt', 'linux'];
 
 function test_content_tab_context_menu() {
   let tabmail = mc.tabmail;
   let w = tabmail.selectedTab.browser.contentWindow;
   let heading = w.document.querySelector("h1");
   let mailContext = mc.e("mailContext");
 
   // Make sure the page's menu items are added on right-click.