diff --git a/collects/tests/mzscheme/makeflats.ss b/collects/tests/mzscheme/makeflats.ss
index 9fc575b29e..6c6b1b35b0 100644
--- a/collects/tests/mzscheme/makeflats.ss
+++ b/collects/tests/mzscheme/makeflats.ss
@@ -25,6 +25,7 @@
 	    "sync.ss"
 	    "deep.ss"
 	    "contmark.ss"
+            "prompt.ss"
 	    "will.ss"
 	    "namespac.ss"
 	    "port.ss"
diff --git a/collects/tests/mzscheme/runflats.ss b/collects/tests/mzscheme/runflats.ss
index beec4a871a..4f6345e82f 100644
--- a/collects/tests/mzscheme/runflats.ss
+++ b/collects/tests/mzscheme/runflats.ss
@@ -1,7 +1,8 @@
 
 (for-each (lambda (f)
 	    (when (regexp-match "^flat-[0-9]+[.]ss$" (path->string f))
-	      (parameterize ([current-namespace (make-namespace)])
+	      (parameterize ([current-namespace (make-namespace)]
+                             [exit-handler void])
 		(eval
 		 `(begin
 		    (require-for-syntax mzscheme)