diff --git a/collects/tests/mzscheme/unit.ss b/collects/tests/mzscheme/unit.ss
index c586ab6..e828beb 100644
--- a/collects/tests/mzscheme/unit.ss
+++ b/collects/tests/mzscheme/unit.ss
@@ -30,7 +30,6 @@
 (syntax-test '(unit (import i) (export (a x . y) b) (define a 5) (define b 6)))
 (syntax-test '(unit (import i) (export b (a x . y)) (define a 5) (define b 6)))
 
-(syntax-test '(unit (import i) (export) (begin)))
 (syntax-test '(unit (import i) (export) (begin 1 . 2)))
 (syntax-test '(unit (import i) (export b a) (begin (define a 5) (define b 6) . x)))
 (syntax-test '(unit (import i) (export b a) (begin (define a 5) (define b 6)) (define b 6)))
@@ -79,8 +78,9 @@
 	(export))))
 
 (unless (defined? 'test-global-var)
-  (define test-global-var 5)
-  (syntax-test '(unit (import) (export) test-global-var)))
+  (let ()
+    (define test-global-var 5)
+    (syntax-test '(unit (import) (export) test-global-var))))
 
 (test #t unit? (unit (import) (export)))
 (test #t unit? (unit (import) (export) 5))
@@ -98,6 +98,11 @@
 									(define-struct a ())
 									make-a
 									1)))))
+
+; Empty begin is OK in a unit context:
+(test #t unit? (unit (import i) (export) (begin)))
+(test #t unit? (unit (import i) (export) (begin (begin))))
+
 (syntax-test '(compound-unit))
 (syntax-test '(compound-unit . x))
 (syntax-test '(compound-unit (import)))
diff --git a/collects/tests/mzscheme/unitsig.ss b/collects/tests/mzscheme/unitsig.ss
index febf742..363266e 100644
--- a/collects/tests/mzscheme/unitsig.ss
+++ b/collects/tests/mzscheme/unitsig.ss
@@ -54,7 +54,6 @@
 (syntax-test '(unit/sig b (import (i : a)) (define x 7) (define i:y 6)))
 (syntax-test '(unit/sig blah (import) (define x 7)))
 
-(syntax-test '(unit/sig () (import) (begin)))
 (syntax-test '(unit/sig () (import) (begin 1 . 2)))
 (syntax-test '(unit/sig () (import) (begin (define x 5)) (define x 5)))
 
@@ -160,6 +159,10 @@
 		    (link [export : () ((unit/sig () (import) 10))])
 		    (export)))
 
+; Empty begin is OK in a unit context:
+(test #t unit/sig? (unit/sig () (import) (begin)))
+(test #t unit/sig? (unit/sig () (import) (begin (begin))))
+
 ; Include:
 
 (define i1@