diff --git a/collects/tests/units/test-unit.ss b/collects/tests/units/test-unit.ss
index 79e606f96e..2d4b7657c1 100644
--- a/collects/tests/units/test-unit.ss
+++ b/collects/tests/units/test-unit.ss
@@ -1,3 +1,5 @@
+#lang scheme/load
+
 (require (for-syntax mzlib/private/unit-compiletime
                      mzlib/private/unit-syntax))
 (require "test-harness.ss"
@@ -148,35 +150,41 @@
         (define-signature x (a b))
         (lookup-sig-mac x)))
 (let ()
-  (define-signature super (s1 (define-values (s2 s3) s4) (define-syntaxes (s5 s6) s7)))
-  (test stx-bound-id=? #'((s1 a b f) (((s2 s3) . s4) ((c d) . e) ((i) . j)) (((s5 s6) . s7) ((g) . h)))
+  (define s7 (void))
+  (define h (void))
+  (define-signature super (s1 (define-values (s2 s3) s4) (define-syntaxes (s5 s6) (values #'s7 #'s7))))
+  (test stx-bound-id=? #'((s1 a b f) (((s2 s3) . s4) ((c d) . e) ((i) . j)) (((s5 s6) . (values #'s7 #'s7)) ((g) . #'h)))
         (let ()
           (define-signature x extends super (a b (define-values (c d) e) f
-                                               (define-syntaxes (g) h)
+                                               (define-syntaxes (g) #'h)
                                                (define-values (i) j)))
           (lookup-sig-mac x))))
 (let ()
-  (define-signature super (s1 (define-values (s2 s3) s4) (define-syntaxes (s5 s6) s7)))
-  (let ((a 1) (g 2) (j 3) (s1 4) (s2 5) (s7 6))
-    (test stx-bound-id=? #'(((#f . s1) a b f) ((((#f . s2) s3) . s4) ((c d) . e) ((i) . j)) (((s5 s6) . (#f . s7)) ((g) . h)))
+  (define s7 (void))
+  (define h (void))
+  (define-signature super (s1 (define-values (s2 s3) s4) (define-syntaxes (s5 s6) (values #'s7 #'s7))))
+  (let ((a 1) (g 2) (j 3) (s1 4) (s2 5))
+    (test stx-bound-id=? #'(((#f . s1) a b f) ((((#f . s2) s3) . s4) ((c d) . e) ((i) . j)) (((s5 s6) . (values #'s7 #'s7)) ((g) . #'h)))
           (let ()
             (define-signature x extends super (a b (define-values (c d) e) f
-                                                 (define-syntaxes (g) h)
+                                                 (define-syntaxes (g) #'h)
                                                  (define-values (i) j)))
             (lookup-sig-mac x)))))
 (let ()
-  (define-signature super (s1 (define-values (s2 s3) s4) (define-syntaxes (s5 s6) s7)))
-  (test stx-bound-id=? #'((s1 a b f) (((s2 s3) . s4) ((c d) . e) ((i) . j)) (((s5 s6) . s7) ((g) . h)))
+  (define s7 (void))
+  (define h (void))
+  (define-signature super (s1 (define-values (s2 s3) s4) (define-syntaxes (s5 s6) (values #'s7 #'s7))))
+  (test stx-bound-id=? #'((s1 a b f) (((s2 s3) . s4) ((c d) . e) ((i) . j)) (((s5 s6) . (values #'s7 #'s7)) ((g) . #'h)))
         (let ()
           (define-signature x extends super (a b (define-values (c d) e) f
-                                               (define-syntaxes (g) h)
+                                               (define-syntaxes (g) #'h)
                                                (define-values (i) j)))
           (let ((a 1) (g 2) (j 3))
             (lookup-sig-mac x)))))
-(test stx-bound-id=? #'(((#f . a) b f) (((c d) . e) ((i) . (#f . j))) ((((#f . g)) . h)))
+(test stx-bound-id=? #'(((#f . a) b f) (((c d) . e) ((i) . (#f . j))) ((((#f . g)) . #'h)))
       (let ((a 1) (g 2) (j 3))
         (define-signature x (a b (define-values (c d) e) f
-                               (define-syntaxes (g) h)
+                               (define-syntaxes (g) #'h)
                                (define-values (i) j)))
         (lookup-sig-mac x)))
 (let ()