diff --git a/collects/test-engine/scheme-tests.ss b/collects/test-engine/scheme-tests.ss
index b954a17792..c2a3746011 100644
--- a/collects/test-engine/scheme-tests.ss
+++ b/collects/test-engine/scheme-tests.ss
@@ -51,8 +51,8 @@
 
 ;; check-expect-maker : syntax? syntax? (listof syntax?) symbol? -> syntax?
 ;; the common part of all three test forms.
-(define-for-syntax (check-expect-maker stx checker-proc-stx embedded-stxes
-                                       hint-tag)
+(define-for-syntax (check-expect-maker
+                    stx checker-proc-stx test-expr embedded-stxes hint-tag)
   (define bogus-name
     (stepper-syntax-property #`#,(gensym 'test) 'stepper-hide-completed #t))
   (define src-info
@@ -62,7 +62,7 @@
                        (syntax-column stx)
                        (syntax-position stx)
                        (syntax-span stx)))))
-  (quasisyntax/loc stx
+  (quasisyntax/loc test-expr
     (define #,bogus-name
       #,(stepper-syntax-property
          #`(let ([test-info (namespace-variable-value
@@ -76,6 +76,7 @@
                                      ['stepper-use-val-as-final #t])
                                   (quasisyntax/loc stx
                                     (#,checker-proc-stx
+                                     (lambda () #,test-expr)
                                      #,@embedded-stxes
                                      #,src-info
                                      #,(with-stepper-syntax-properties
@@ -99,8 +100,7 @@
     (raise-syntax-error 'check-expect CHECK-EXPECT-DEFN-STR stx))
   (syntax-case stx ()
     [(_ test actual)
-     (check-expect-maker stx #'check-values-expected
-                         (list #`(lambda () test) #`actual)
+     (check-expect-maker stx #'check-values-expected #`test (list #`actual)
                          'comes-from-check-expect)]
     [_ (raise-syntax-error 'check-expect CHECK-EXPECT-STR stx)]))
 
@@ -119,8 +119,7 @@
     (raise-syntax-error 'check-within CHECK-WITHIN-DEFN-STR stx))
   (syntax-case stx ()
     [(_ test actual within)
-     (check-expect-maker stx #'check-values-within
-                         (list #`(lambda () test) #`actual #`within)
+     (check-expect-maker stx #'check-values-within #`test (list #`actual #`within)
                          'comes-from-check-within)]
     [_ (raise-syntax-error 'check-within CHECK-WITHIN-STR stx)]))
 
@@ -137,8 +136,7 @@
     (raise-syntax-error 'check-error CHECK-ERROR-DEFN-STR stx))
   (syntax-case stx ()
     [(_ test error)
-     (check-expect-maker stx #'check-values-error
-                         (list #'(lambda () test) #`error)
+     (check-expect-maker stx #'check-values-error #`test (list #`error)
                          'comes-from-check-error)]
     [_ (raise-syntax-error 'check-error CHECK-ERROR-STR stx)]))