diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/main.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/main.rkt
index 4df4639911..a369f420c1 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/main.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/main.rkt
@@ -143,6 +143,11 @@
         (dr p))))))
 
 
+(define (test/gui suite)
+  (((dynamic-require 'rackunit/private/gui/gui 'make-gui-runner))
+   suite))
+
+
 (define (go tests) (test/gui tests))
 (define (go/text tests)
   (force (delay/thread (run-tests tests 'verbose))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt
index 5b48c6402c..ea40a94e04 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt
@@ -28,7 +28,7 @@
          (places (and (integer? n) (> n 1) n)))]
  ["--gui" "run using the gui"
           (if (gui-available?)
-              (begin (exec go))
+              (exec go)
               (error "GUI not available"))])
 
 (start-workers)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/all-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/all-tests.rkt
index a0411a39b9..dafa80d018 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/all-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/all-tests.rkt
@@ -46,6 +46,6 @@
 
 
 
-(define-go (lambda () unit-tests))
+(define go (lambda () unit-tests))
 
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
index fcfed8c53c..ccbb8f9b54 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
@@ -3,41 +3,14 @@
 (require scheme/require-syntax
          scheme/match
          scheme/gui/dynamic
-	 typed-racket/utils/utils
+         typed-racket/utils/utils
          (for-syntax scheme/base)
          (types utils)
          (rep type-rep)
          rackunit rackunit/text-ui)
 
-(provide private typecheck (rename-out [infer r:infer]) utils env rep types base-env (all-defined-out))
-
-(define (mk-suite ts)
-  (match (map (lambda (f) (f)) ts)
-	 [(list t) t]
-	 [ts (make-test-suite "Combined Test Suite" ts)]))
-
-(define (run . ts)
-  (run-tests (mk-suite ts)))
-
-(define (test/gui suite)
-  (((dynamic-require 'rackunit/private/gui/gui 'make-gui-runner))
-   suite))
-
-(define (run/gui . ts)
-  (test/gui (mk-suite ts)))
-
-
-(define-syntax (define-go stx)
-  (syntax-case stx ()
-    [(_ args ...)
-     (with-syntax
-      ([go (datum->syntax stx 'go)]
-       [go/gui (datum->syntax stx 'go/gui)]
-       [(tmps ...) (generate-temporaries #'(args ...))])
-      #'(define-values (go go/gui)
-	  (let ([tmps args] ...)
-	    (values (lambda () (run tmps ...))
-		    (lambda () (run/gui tmps ...))))))]))
+(provide private typecheck (rename-out [infer r:infer]) utils env rep types base-env
+         (all-defined-out))
 
 ;; FIXME - do something more intelligent
 (define (tc-result-equal/test? a b)
@@ -52,4 +25,3 @@
   (syntax-case stx ()
     [(_ nm a b)
      (syntax/loc stx (test-case nm (check-tc-result-equal?* a b)))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-annotation-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-annotation-test.rkt
index 89df33e821..a928f511f7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-annotation-test.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-annotation-test.rkt
@@ -32,9 +32,3 @@
    (tat (ann foo : Number) (ret -Number (make-NoFilter) (make-NoObject)))
    (tat foo #f)
    (tat (ann foo : 3) (ret (-val 3) (make-NoFilter) (make-NoObject)))))
-
-(define-go
-  type-annotation-tests)
-
-
-