diff --git a/ietf/doc/tests_unprepped.py b/ietf/doc/tests_notprepped.py
similarity index 92%
rename from ietf/doc/tests_unprepped.py
rename to ietf/doc/tests_notprepped.py
index f88af8e81a6..f417aa79310 100644
--- a/ietf/doc/tests_unprepped.py
+++ b/ietf/doc/tests_notprepped.py
@@ -12,7 +12,7 @@
 from ietf.utils.test_utils import TestCase
 
 
-class UnpreppedRfcXmlTests(TestCase):
+class NotpreppedRfcXmlTests(TestCase):
     def test_editor_source_button_visibility(self):
         pre_v3 = WgRfcFactory(rfc_number=settings.FIRST_V3_RFC - 1)
         first_v3 = WgRfcFactory(rfc_number=settings.FIRST_V3_RFC)
@@ -72,13 +72,17 @@ def test_rfcxml_notprepped(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 404)
 
-        # 200 with correct content-type and body when object is fully stored
+        # 200 with correct content-type, attachment disposition, and body when object is fully stored
         xml_content = b"<rfc>test</rfc>"
         store_bytes("rfc", stored_name, xml_content, allow_overwrite=True)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r["Content-Type"], "application/xml")
-        self.assertEqual(r.content, xml_content)
+        self.assertEqual(
+            r["Content-Disposition"],
+            f'attachment; filename="rfc{number}.notprepped.xml"',
+        )
+        self.assertEqual(b"".join(r.streaming_content), xml_content)
 
     def test_rfcxml_notprepped_wrapper(self):
         number = settings.FIRST_V3_RFC
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index a23185333ed..5b57a620743 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -43,9 +43,10 @@
 
 from celery.result import AsyncResult
 from django.core.cache import caches
+from django.core.files.base import ContentFile
 from django.core.exceptions import PermissionDenied
 from django.db.models import Max
-from django.http import HttpResponse, Http404, HttpResponseBadRequest, JsonResponse
+from django.http import FileResponse, HttpResponse, Http404, HttpResponseBadRequest, JsonResponse
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.urls import reverse as urlreverse
@@ -2372,7 +2373,7 @@ def rfcxml_notprepped(request, number):
         bytes = retrieve_bytes("rfc", name)
     except FileNotFoundError:
         raise Http404
-    return HttpResponse(bytes, content_type="application/xml")
+    return FileResponse(ContentFile(bytes, name=f"rfc{number}.notprepped.xml"), as_attachment=True)
 
 
 def rfcxml_notprepped_wrapper(request, number):