diff --git a/collects/tests/typed-scheme/run.rkt b/collects/tests/typed-scheme/run.rkt
index f2ff3c1007..c462e3d967 100644
--- a/collects/tests/typed-scheme/run.rkt
+++ b/collects/tests/typed-scheme/run.rkt
@@ -1,7 +1,15 @@
-#lang racket/base
-(require racket/vector)
+#lang racket
+(require racket/vector racket/gui/dynamic)
 
 (require "main.ss")
 (current-namespace (make-base-namespace))
-(unless (= 0 (go/text (vector-member "unit" (current-command-line-arguments))))
+(define exec (make-parameter go/text))
+(define unit-only? (make-parameter #f))
+(command-line
+ #:once-each
+ ["--unit" "run just the unit tests" (unit-only? #t)]
+ ["--gui" "run using the gui" 
+  (current-namespace ((gui-dynamic-require 'make-gui-namespace)))
+  (exec go)])
+(unless (= 0 ((exec) (unit-only?)))
   (error "Typed Scheme Tests did not pass."))