diff --git a/collects/tests/mzscheme/advanced.ss b/collects/tests/mzscheme/advanced.ss
index b7864c2428..577c11a023 100644
--- a/collects/tests/mzscheme/advanced.ss
+++ b/collects/tests/mzscheme/advanced.ss
@@ -49,12 +49,17 @@
 (test 2 'begin (begin 1 2))
 (test 3 'begin (begin 1 2 3))
 
+(htdp-top (define ex 12))
+(htdp-test 13 'begin+set! (begin (set! ex 13) ex))
+(htdp-test 12 'begin+set! (begin 12 ex))
+(htdp-top-pop 1)
+
 (htdp-syntax-test #'begin0)
 (htdp-syntax-test #'(begin0))
 
-(test 1 'begin0 (begin0 1))
-(test 2 'begin0 (begin0 2 1))
-(test 3 'begin0 (begin0 3 2 1))
+(htdp-test 1 'begin0 (begin0 1))
+(htdp-test 2 'begin0 (begin0 2 1))
+(htdp-test 3 'begin0 (begin0 3 2 1))
 
 (htdp-syntax-test #'set!)
 (htdp-syntax-test #'(set!))
diff --git a/collects/tests/mzscheme/htdp-test.ss b/collects/tests/mzscheme/htdp-test.ss
index 3571d5f6c7..5c26e67280 100644
--- a/collects/tests/mzscheme/htdp-test.ss
+++ b/collects/tests/mzscheme/htdp-test.ss
@@ -21,10 +21,29 @@
 		  (and (exn:fail:syntax? x)
 		       (regexp-match rx (exn-message x)))))]))
 
+(require (rename mzscheme mz-let let))
+
 (define-syntax (htdp-test stx)
   (syntax-case stx ()
     [(_ expect f . args)
-     #'(do-htdp-test #'(test expect f . args) #f #f)]))
+     #'(begin
+	 (do-htdp-test #'(test expect f . args) #f #f)
+	 (htdp-try-direct-module f . args))]))
+
+(define-syntax (htdp-try-direct-module stx)
+  (syntax-case stx ()
+    [(_ 'nm expr)
+     ;; double-check that there's no error, at least,
+     ;;  when using the real module-begin:
+     #'(mz-let ([name (gensym)])
+	       (eval
+		#`(module #,name #,current-htdp-lang
+		    #,@body-accum
+		    expr))
+	       (dynamic-require name #f))]
+    [_ 
+     (printf "~s\n" (syntax-object->datum stx))
+     #'(void)]))
 
 (define (htdp-string-to-pred exn?/rx)
   (if (string? exn?/rx)