diff --git a/docshell/test/chrome/662200a.html b/docshell/test/chrome/662200a.html
new file mode 100644
index 000000000000..0b9ead6f3e09
--- /dev/null
+++ b/docshell/test/chrome/662200a.html
@@ -0,0 +1,8 @@
+﻿<html>
+  <head>
+    <title>A</title>
+  </head>
+  <body>
+  <a id="link" href="662200b.html">Next</a>
+  </body>
+</html>
diff --git a/docshell/test/chrome/662200b.html b/docshell/test/chrome/662200b.html
new file mode 100644
index 000000000000..91e6b971d672
--- /dev/null
+++ b/docshell/test/chrome/662200b.html
@@ -0,0 +1,8 @@
+﻿<html>
+  <head>
+    <title>B</title>
+  </head>
+  <body>
+  <a id="link" href="662200c.html">Next</a>
+  </body>
+</html>
diff --git a/docshell/test/chrome/662200c.html b/docshell/test/chrome/662200c.html
new file mode 100644
index 000000000000..bc00e6b14b6a
--- /dev/null
+++ b/docshell/test/chrome/662200c.html
@@ -0,0 +1,7 @@
+﻿<html>
+  <head>
+    <title>C</title>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/docshell/test/chrome/Makefile.in b/docshell/test/chrome/Makefile.in
index 9f41478819a3..8888d772aa90 100644
--- a/docshell/test/chrome/Makefile.in
+++ b/docshell/test/chrome/Makefile.in
@@ -109,6 +109,11 @@ _TEST_FILES =	\
 		test_bug454235.xul \
 		bug454235-subframe.xul \
 		test_bug456980.xul \
+		test_bug662200.xul \
+		bug662200_window.xul \
+		662200a.html \
+		662200b.html \
+		662200c.html \
 		$(NULL)
 
 _DOCSHELL_SUBHARNESS = \
diff --git a/docshell/test/chrome/bug662200_window.xul b/docshell/test/chrome/bug662200_window.xul
new file mode 100644
index 000000000000..61ee3d25e6d5
--- /dev/null
+++ b/docshell/test/chrome/bug662200_window.xul
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window id="303267Test"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        width="600"
+        height="600"
+        onload="setTimeout(nextTest,0);"
+        title="bug 662200 test">
+
+  <script type="application/javascript"
+  src="docshell_helpers.js">
+  </script>
+  <script type="application/javascript" src= "chrome://mochikit/content/chrome-harness.js" />
+  <script type="application/javascript"><![CDATA[
+  
+    // Define the generator-iterator for the tests.
+    var tests = testIterator();
+
+    ////
+    // Execute the next test in the generator function.
+    //
+    function nextTest() {
+      tests.next();
+    }
+
+    ////
+    // Generator function for test steps for bug 662200:  
+    // Description goes here.
+    //
+    function testIterator()
+    {
+      // Load the first test page
+      var navData = {
+        uri: getHttpUrl("662200a.html"),
+        eventsToListenFor: ["pageshow"],
+        expectedEvents: [ {type: "pageshow", title: "A"} ],
+        onNavComplete: nextTest
+      };
+      doPageNavigation(navData);
+      yield;
+      
+      // Load the second test page.
+      navData = {
+        eventsToListenFor: ["pageshow", "pagehide"],
+        expectedEvents: [ {type: "pagehide", 
+                           title: "A"},
+                          {type: "pageshow", 
+                           title: "B"} ],
+        onNavComplete: nextTest
+      }
+      waitForPageEvents(navData);
+      var link = TestWindow.getDocument().getElementById("link");
+      var event = TestWindow.getDocument().createEvent("MouseEvents");
+      event.initMouseEvent("click", true, true, TestWindow.getWindow(),
+                           0, 0, 0, 0, 0, false, false, false, false, 0, null);
+      link.dispatchEvent(event);
+      yield;
+
+      // Load the third test page.
+      navData = {
+        eventsToListenFor: ["pageshow", "pagehide"],
+        expectedEvents: [ {type: "pagehide", 
+                           title: "B"},
+                          {type: "pageshow", 
+                           title: "C"} ],
+        onNavComplete: nextTest
+      };
+      waitForPageEvents(navData);
+      var link = TestWindow.getDocument().getElementById("link");
+      var event = TestWindow.getDocument().createEvent("MouseEvents");
+      event.initMouseEvent("click", true, true, TestWindow.getWindow(),
+                           0, 0, 0, 0, 0, false, false, false, false, 0, null);
+      link.dispatchEvent(event);
+      yield;
+      
+      // Go back.
+      navData = {
+        back: true,
+        eventsToListenFor: ["pageshow", "pagehide"],
+        expectedEvents: [ {type: "pagehide", 
+                           title: "C"},
+                          {type: "pageshow", 
+                           title: "B"} ],
+        onNavComplete: nextTest
+      };
+      doPageNavigation(navData);
+      yield;
+
+      var Ci = Components.interfaces;
+      var docshell = TestWindow.getWindow()
+                               .QueryInterface(Ci.nsIInterfaceRequestor)
+                               .getInterface(Ci.nsIWebNavigation)
+                               .QueryInterface(Ci.nsIDocShell);
+      var shistory = docshell.QueryInterface(Ci.nsIInterfaceRequestor)
+                             .getInterface(Ci.nsISHistory)
+                             .QueryInterface(Ci.nsIWebNavigation);
+
+      // Reload.
+      navData = {
+        eventsToListenFor: ["pageshow", "pagehide"],
+        expectedEvents: [ {type: "pagehide", 
+                           title: "B"},
+                          {type: "pageshow", 
+                           title: "B"} ],
+        onNavComplete: nextTest
+      };
+      // Asking the docshell harness to reload for us will call reload on
+      // nsDocShell which has different behavior than the reload on nsSHistory
+      // so we call reload explicitly here
+      waitForPageEvents(navData);
+      shistory.reload(0);
+      yield;
+
+      // After this sequence of events, we should be able to go back and forward
+      is(TestWindow.getBrowser().canGoBack, true, "Should be able to go back!");
+      is(TestWindow.getBrowser().canGoForward, true, "Should be able to go forward!");
+      is(shistory.requestedIndex, -1, "Requested index should be cleared!");
+
+      // Tell the framework the test is finished.  Include the final 'yield' 
+      // statement to prevent a StopIteration exception from being thrown.
+      finish();
+      yield;
+    }
+    
+  ]]></script>
+
+  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+</window>
diff --git a/docshell/test/chrome/docshell_helpers.js b/docshell/test/chrome/docshell_helpers.js
index d55a2748560f..04eefdaa1727 100755
--- a/docshell/test/chrome/docshell_helpers.js
+++ b/docshell/test/chrome/docshell_helpers.js
@@ -41,6 +41,8 @@ var gExtractedPath = null;    //used to cache file path for extracting files fro
  *
  *            forward: if true, the browser will execute goForward()
  *
+ *             reload: if true, the browser will execute reload()
+ *
  *  eventsToListenFor: an array containing one or more of the following event  
  *                     types to listen for:  "pageshow", "pagehide", "onload",
  *                     "onunload".  If this property is undefined, only a 
diff --git a/docshell/test/chrome/test_bug662200.xul b/docshell/test/chrome/test_bug662200.xul
new file mode 100644
index 000000000000..8a1ac47de25c
--- /dev/null
+++ b/docshell/test/chrome/test_bug662200.xul
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet
+  href="chrome://mochikit/content/tests/SimpleTest/test.css"
+  type="text/css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=662200.xul
+-->
+<window title="Mozilla Bug 662200"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <title>Test for Bug 662200</title>
+  <script type="application/javascript"
+    src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript"
+    src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+<body  xmlns="http://www.w3.org/1999/xhtml">
+<a target="_blank"
+   href="https://bugzilla.mozilla.org/show_bug.cgi?id=662200">
+   Mozilla Bug 662200</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+
+<script class="testbody" type="application/javascript">
+<![CDATA[
+
+/** Test for Bug 662200 **/
+
+SimpleTest.waitForExplicitFinish();
+window.open("bug662200_window.xul", "bug662200",
+            "chrome,width=600,height=600");
+
+]]>
+</script>
+
+</window>
