diff --git a/txexpr/tests.rkt b/txexpr/tests.rkt
index 2ad76a9..906855e 100644
--- a/txexpr/tests.rkt
+++ b/txexpr/tests.rkt
@@ -2,6 +2,16 @@
 (require (for-syntax racket/base racket/syntax))
 
 (define-syntax (eval-as-untyped stx)
+  (syntax-case stx ()
+    [(_ exprs ...)
+     (with-syntax ([sym (generate-temporary)]) 
+       #'(begin
+           (module sym racket
+             (require rackunit txexpr)
+             exprs ...)
+           (require 'sym)))]))
+
+(define-syntax (eval-as-untyped-safe stx)
   (syntax-case stx ()
     [(_ exprs ...)
      (with-syntax ([sym (generate-temporary)]) 
@@ -24,7 +34,8 @@
 (define-syntax-rule (eval-as-typed-and-untyped exprs ...)
   (begin
     (eval-as-typed exprs ...)
-    (eval-as-untyped exprs ...)))
+    (eval-as-untyped exprs ...)
+    (eval-as-untyped-safe exprs ...)))
 
 
 (eval-as-typed-and-untyped