diff --git a/mozilla/content/base/test/Makefile.in b/mozilla/content/base/test/Makefile.in
index c73bab8c149..1f655dc3e83 100644
--- a/mozilla/content/base/test/Makefile.in
+++ b/mozilla/content/base/test/Makefile.in
@@ -184,6 +184,9 @@ _TEST_FILES = 	test_bug5141.html \
 		bug461735-redirect2.sjs \
 		bug461735-post-redirect.js \
 		test_bug461735.html \
+		test_bug458248.html \
+		file_bug458248.xml \
+		file_bug458248.xml^headers^ \
 	$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/mozilla/content/base/test/file_bug458248.xml b/mozilla/content/base/test/file_bug458248.xml
new file mode 100644
index 00000000000..2e8e2d8280f
--- /dev/null
+++ b/mozilla/content/base/test/file_bug458248.xml
@@ -0,0 +1 @@
+<out>hello</out>
diff --git a/mozilla/content/base/test/file_bug458248.xml^headers^ b/mozilla/content/base/test/file_bug458248.xml^headers^
new file mode 100644
index 00000000000..40abfb0b2bc
--- /dev/null
+++ b/mozilla/content/base/test/file_bug458248.xml^headers^
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: http://example.com/tests/content/base/test/file_bug458248.xml
diff --git a/mozilla/content/base/test/test_XHR.html b/mozilla/content/base/test/test_XHR.html
index 17d3eedab10..dc3801fc922 100644
--- a/mozilla/content/base/test/test_XHR.html
+++ b/mozilla/content/base/test/test_XHR.html
@@ -53,7 +53,7 @@ for (i = 0; i < failFiles.length; ++i) {
   }
   if (!didthrow) {
     is(xhr.status, 301, "wrong status");
-    is(xhr.responseText, "redirect file\n", "wrong response");
+    is(xhr.responseText, "", "wrong response");
   }
   else {
     ok(1, "should have thrown or given incorrect result");
diff --git a/mozilla/content/base/test/test_bug458248.html b/mozilla/content/base/test/test_bug458248.html
new file mode 100644
index 00000000000..ebe4e437b5f
--- /dev/null
+++ b/mozilla/content/base/test/test_bug458248.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for Bug 458248</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>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+xhr = new XMLHttpRequest();
+xhr.open('GET', 'file_bug458248.xml', false);
+xhr.send(null);
+is(xhr.responseXML, null);
+is(xhr.responseText, "");
+is(xhr.getAllResponseHeaders(), "");
+is(xhr.getResponseHeader('Location'), "");
+
+</script>
+</pre>
+</body>
+</html>
