diff --git a/mozilla/docshell/test/Makefile.in b/mozilla/docshell/test/Makefile.in
index 7bc5d541d35..5cde3545edb 100644
--- a/mozilla/docshell/test/Makefile.in
+++ b/mozilla/docshell/test/Makefile.in
@@ -49,6 +49,7 @@ include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
 		test_bug344861.html \
+		test_bug387979.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/mozilla/docshell/test/test_bug387979.html b/mozilla/docshell/test/test_bug387979.html
new file mode 100644
index 00000000000..805c446c536
--- /dev/null
+++ b/mozilla/docshell/test/test_bug387979.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=387979
+-->
+<head>
+  <title>Test for Bug 387979</title>
+  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
+  <script type="text/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=387979">Mozilla Bug 387979</a>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 387979 **/
+function a(s) {
+	var r;
+	try { r = frames[0].document.body; }
+	catch (e) { r = e; }
+        is(r instanceof HTMLBodyElement, true,
+           "Can't get body" + s);
+}
+var p = 0;
+function b() {
+	switch (++p) {
+	case 1:
+		frames[0].location = "about:blank";
+		break;
+	case 2:
+		a("before reload");
+		frames[0].location.reload();
+		break;
+	case 3:
+		a("after reload");
+                SimpleTest.finish();
+		break;
+	}
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+</pre>
+<p id="display">
+  <iframe onload="b()"></iframe>
+  <pre id="p">-</pre>
+</p>
+</body>
+</html>
+
