diff --git a/toolkit/components/satchel/test/test_bug_511615.html b/toolkit/components/satchel/test/test_bug_511615.html
index 0ba5ccd0121..0854689639d 100644
--- a/toolkit/components/satchel/test/test_bug_511615.html
+++ b/toolkit/components/satchel/test/test_bug_511615.html
@@ -12,7 +12,7 @@ Form History test: form field autocomplete
 <p id="display"></p>
 
 <!-- we presumably can't hide the content for this test. -->
-<div id="content">
+<div id="content" style="direction: rtl;">
   <!-- unused -->
   <form id="unused" onsubmit="return false;">
     <input  type="text" name="field1" value="unused">
@@ -32,6 +32,7 @@ Form History test: form field autocomplete
 netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
 var autocompletePopup = getAutocompletePopup();
+autocompletePopup.style.direction = "ltr";
 
 var input = $_(1, "field1");
 
@@ -366,6 +367,7 @@ function runTest(testNum) {
     case 211:
         checkPopupOpen(false);
         checkForm("");
+        is(autocompletePopup.style.direction, "rtl", "direction should have been changed from ltr to rtl");
 
         SimpleTest.finish();
         return;
diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in
index 3d585c110d3..5e5fd4d640b 100644
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -72,7 +72,6 @@ _TEST_FILES = 	findbar_window.xul \
 		test_bug570192.xul \
 		test_bug624329.xul \
 		bug624329_window.xul \
-		test_bug649840.xul \
 		test_popup_preventdefault_chrome.xul \
 		window_popup_preventdefault_chrome.xul \
 		test_largemenu.xul \
diff --git a/toolkit/content/tests/chrome/test_bug649840.xul b/toolkit/content/tests/chrome/test_bug649840.xul
deleted file mode 100644
index f2c0c0dc048..00000000000
--- a/toolkit/content/tests/chrome/test_bug649840.xul
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=649840
--->
-<window title="Mozilla Bug 649840" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-
-  <textbox id="textLTR" type="autocomplete" autocompletesearch="simple"/>
-  <textbox id="textRTL" type="autocomplete" autocompletesearch="simple"/>
-
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=649840"
-     target="_blank">Mozilla Bug 649840</a>
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript">
-  <![CDATA[
-/** Test for Bug 649840 **/
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(runTest);
-
-function runTest()
-{
-  var textLTR = $("textLTR");
-  var textRTL = $("textRTL");
-
-  textLTR.style.direction = "ltr";
-  textRTL.style.direction = "rtl";
-
-  textLTR.value="abcd";
-  textRTL.value="ابجد";
-
-  // open and close the popups to update the popupdir attribute value
-  textLTR.openPopup();
-  textLTR.closePopup();
-  textRTL.openPopup();
-  textRTL.closePopup();
-  
-  is(textLTR.popup.style.direction, textLTR.style.direction, "LTR textbox test fails");
-  is(textRTL.popup.style.direction, textRTL.style.direction, "RTL textbox test fails");
-
-  // switch directions of the two textboxes
-  textLTR.style.direction = "rtl";
-  textRTL.style.direction = "ltr";
-
-  // open and close the popups to update the popupdir attribute value
-  textLTR.openPopup();
-  textLTR.closePopup();
-  textRTL.openPopup();
-  textRTL.closePopup();
-
-  is(textLTR.popup.style.direction, textLTR.style.direction, "RTL-switched textbox test fails");
-  is(textRTL.popup.style.direction, textRTL.style.direction, "LTR-switched textbox test fails");
-
-  SimpleTest.finish();
-}
-
-  ]]>
-  </script>
-</window>
