diff --git a/pkgs/drracket-pkgs/drracket/scribble/tools/private/mk-drs-bitmaps.rkt b/pkgs/drracket-pkgs/drracket/scribble/tools/private/mk-drs-bitmaps.rkt
index 2ef74bfd14..0cbddb91ad 100644
--- a/pkgs/drracket-pkgs/drracket/scribble/tools/private/mk-drs-bitmaps.rkt
+++ b/pkgs/drracket-pkgs/drracket/scribble/tools/private/mk-drs-bitmaps.rkt
@@ -62,17 +62,7 @@
 (define pdf-bitmap (mk-bitmap draw1))
 (define html-bitmap (mk-bitmap draw2))
 
-(begin
+(module+ main
   (send pdf-bitmap save-file "../pdf.png" 'png)
-  (send html-bitmap save-file "../html.png" 'png))
-
-(match (current-command-line-arguments)
- [(vector "skip") (void)]
- [_ (send f show #t)])
-
-
-;; Test mode:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "skip")])
-    (dynamic-require (quote-module-path "..") #f)))
+  (send html-bitmap save-file "../html.png" 'png)
+  (send f show #t))
diff --git a/pkgs/games/mines/gen-tiles.rkt b/pkgs/games/mines/gen-tiles.rkt
index 2a77c2d473..c2364210b9 100644
--- a/pkgs/games/mines/gen-tiles.rkt
+++ b/pkgs/games/mines/gen-tiles.rkt
@@ -3,6 +3,8 @@
   (require racket/gui
            racket/math)
 
+  (module test racket/base)
+
   (define SIZE 24)
 
   (define bm (make-object bitmap% SIZE SIZE))