diff --git a/collects/tests/mzscheme/all.ss b/collects/tests/mzscheme/all.ss
index 2f9387c6e2..b2a713926b 100644
--- a/collects/tests/mzscheme/all.ss
+++ b/collects/tests/mzscheme/all.ss
@@ -1,11 +1,10 @@
 
 (load-relative "loadtest.ss")
-(load-relative "mz.ss")
-(load-relative "scheme.ss")
-(load-relative "mzlib.ss")
+(load-relative "mz-tests.ss")
+(load-relative "scheme-tests.ss")
+(load-relative "mzlib-tests.ss")
+(load-relative "syntax-tests.ss")
 (load-in-sandbox "version.ss")
-(load-in-sandbox "moddep.ss")
-(load-in-sandbox "boundmap-test.ss")
 (load-in-sandbox "net.ss")
 (load-in-sandbox "foreign-test.ss")
 (load-in-sandbox "uni-norm.ss")
diff --git a/collects/tests/mzscheme/expand.ss b/collects/tests/mzscheme/expand.ss
index bf13945fdb..ef00b03c8e 100644
--- a/collects/tests/mzscheme/expand.ss
+++ b/collects/tests/mzscheme/expand.ss
@@ -125,7 +125,7 @@
  'expand-load
  #f
  (lambda ()
-   (namespace-set-variable-value! 'expand-load "mz.ss")))
+   (namespace-set-variable-value! 'expand-load "mz-tests.ss")))
 
 (let ([orig (current-eval)])
   (dynamic-wind
diff --git a/collects/tests/mzscheme/makeflat.ss b/collects/tests/mzscheme/makeflat.ss
index aa9b73c9cb..7e7acab904 100644
--- a/collects/tests/mzscheme/makeflat.ss
+++ b/collects/tests/mzscheme/makeflat.ss
@@ -3,7 +3,7 @@
 		 (lambda (exn)
 		   (namespace-set-variable-value!
 		    'flat-load
-		    "mz.ss"))])
+		    "mz-tests.ss"))])
   (namespace-variable-value 'flat-load))
 
 (with-handlers ([exn:fail:contract:variable?
diff --git a/collects/tests/mzscheme/mz.ss b/collects/tests/mzscheme/mz-tests.ss
similarity index 100%
rename from collects/tests/mzscheme/mz.ss
rename to collects/tests/mzscheme/mz-tests.ss
diff --git a/collects/tests/mzscheme/mzlib.ss b/collects/tests/mzscheme/mzlib-tests.ss
similarity index 100%
rename from collects/tests/mzscheme/mzlib.ss
rename to collects/tests/mzscheme/mzlib-tests.ss
diff --git a/collects/tests/mzscheme/mzq.ss b/collects/tests/mzscheme/mzq.ss
index f3bb3dcbe8..6158af2c2c 100644
--- a/collects/tests/mzscheme/mzq.ss
+++ b/collects/tests/mzscheme/mzq.ss
@@ -1,3 +1,3 @@
 
-(define quiet-load "mz.ss")
+(define quiet-load "mz-tests.ss")
 (load-relative "quiet.ss")
diff --git a/collects/tests/mzscheme/scheme.ss b/collects/tests/mzscheme/scheme-tests.ss
similarity index 100%
rename from collects/tests/mzscheme/scheme.ss
rename to collects/tests/mzscheme/scheme-tests.ss
diff --git a/collects/tests/mzscheme/syntax-tests.ss b/collects/tests/mzscheme/syntax-tests.ss
new file mode 100644
index 0000000000..e12d706275
--- /dev/null
+++ b/collects/tests/mzscheme/syntax-tests.ss
@@ -0,0 +1,7 @@
+(load-relative "loadtest.ss")
+
+(load-in-sandbox "moddep.ss")
+(load-in-sandbox "boundmap-test.ss")
+(load-in-sandbox "cm.ss")
+
+(report-errs)