diff --git a/collects/tests/mzscheme/file.ss b/collects/tests/mzscheme/file.ss
index e99f840a07..30e58a81da 100644
--- a/collects/tests/mzscheme/file.ss
+++ b/collects/tests/mzscheme/file.ss
@@ -646,8 +646,15 @@
 (arity-test (port-read-handler ui) 1 2)
 (err/rt-test ((port-read-handler ui) 8))
 (let ([old (port-read-handler ui)])
-  (port-read-handler ui (case-lambda [(x) "hello"][(x y) "goodbye"]))
+  (port-read-handler ui (case-lambda [(x) "hello"][(x y) #'"goodbye"]))
   (test "hello" read ui)
+  (test "goodbye" syntax-e (read-syntax 'x ui))
+  (port-read-handler ui old)
+  (test "" read ui))
+(let ([old (port-read-handler ui)])
+  (port-read-handler ui (case-lambda [(x) eof][(x y) eof]))
+  (test eof read ui)
+  (test eof read-syntax 'x ui)
   (port-read-handler ui old)
   (test "" read ui))
 (arity-test port-read-handler 1 2)