diff --git a/parser/htmlparser/tests/mochitest/Makefile.in b/parser/htmlparser/tests/mochitest/Makefile.in
index d2b4ebef5cf8..1b640bdda07a 100644
--- a/parser/htmlparser/tests/mochitest/Makefile.in
+++ b/parser/htmlparser/tests/mochitest/Makefile.in
@@ -87,6 +87,8 @@ _TEST_FILES =	parser_datreader.js \
 		test_bug642908.html \
 		file_bug642908.sjs \
 		test_bug645115.html \
+		test_bug655682.html \
+		file_bug655682.sjs \
 		$(NULL)
 
 # Disabled test due to orange on Linux
diff --git a/parser/htmlparser/tests/mochitest/file_bug655682.sjs b/parser/htmlparser/tests/mochitest/file_bug655682.sjs
new file mode 100644
index 000000000000..c63a179f8d78
--- /dev/null
+++ b/parser/htmlparser/tests/mochitest/file_bug655682.sjs
@@ -0,0 +1,34 @@
+var timer;
+var callback;
+
+function handleRequest(request, response)
+{
+  if (request.queryString.indexOf("trigger") != -1) {
+    setState("triggered", "triggered");
+    response.setHeader("Cache-Control", "no-cache", false);
+    response.setHeader("Content-Type", "text/javascript; charset=utf-8", false);
+    response.write(";");
+  } else {
+    response.processAsync();
+    response.setHeader("Cache-Control", "no-cache", false);
+    response.setHeader("Content-Type", "text/html; charset=utf-8", false);
+    response.write("<table><tr><td>A</td>     ");
+    response.bodyOutputStream.flush();
+    timer = Components.classes["@mozilla.org/timer;1"]
+      .createInstance(Components.interfaces.nsITimer);
+
+    callback = function() {
+      if (getState("triggered") == "triggered") {
+        response.write("<td>B</td></tr></table>");
+        response.finish();
+      } else {
+        timer.initWithCallback(callback,
+                               10,
+                               Components.interfaces.nsITimer.TYPE_ONE_SHOT);
+      }
+    }
+    timer.initWithCallback(callback,
+                           10,
+                           Components.interfaces.nsITimer.TYPE_ONE_SHOT);
+    }
+}
diff --git a/parser/htmlparser/tests/mochitest/test_bug655682.html b/parser/htmlparser/tests/mochitest/test_bug655682.html
new file mode 100644
index 000000000000..c3e809d3f5f3
--- /dev/null
+++ b/parser/htmlparser/tests/mochitest/test_bug655682.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=655682
+-->
+<head>
+  <title>Test for Bug 655682</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=655682">Mozilla Bug 655682</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <iframe src=file_bug655682.sjs></iframe>
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 655682 **/
+
+var gotOnload = false;
+var finishedTesting = false;
+
+function tryFinishTest() {
+  if (gotOnload && finishedTesting) {
+    SimpleTest.finish();
+  }
+}
+
+addLoadEvent(function() {
+  // Hit the event loop again just to make sure that we're not ending the test
+  // before all activity we care about is done.
+  SimpleTest.executeSoon(function() {
+    gotOnload = true;
+    tryFinishTest();
+  });
+});
+
+var tdsSeen = 0;
+
+var triggeredSecondTd = false;
+
+var iframe = document.getElementsByTagName("iframe")[0];
+
+SimpleTest.waitForExplicitFinish();
+
+function probe() {
+  var tds = iframe.contentDocument.getElementsByTagName("td").length;
+  switch (tds) {
+    case 0:
+      setTimeout(probe, 0);
+      return;
+    case 1:
+      tdsSeen = tds;
+      if (!triggeredSecondTd) {
+        triggeredSecondTd = true;
+        var script = document.createElement("script");
+        script.src = "file_bug655682.sjs?trigger=1";
+        document.head.appendChild(script);
+      }
+      setTimeout(probe, 0);
+      return;
+    case 2:
+      is(tdsSeen, 1, "Should have seen one td before seeing two.");      
+      finishedTesting = true;
+      tryFinishTest();
+      return;
+    default:
+      ok(false, "Wrong number of tds");
+      SimpleTest.finish();
+  }
+}
+
+setTimeout(probe, 0);
+
+</script>
+</pre>
+</body>
+</html>
