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 dafa80d018..a9db917a79 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
@@ -17,35 +17,27 @@
  "interactive-tests.rkt"
 
  racket/runtime-path
- rackunit rackunit/text-ui)
+ rackunit)
 
 (provide unit-tests)
 
-
 (define-runtime-path special "special-env-typecheck-tests.rkt")
 
 (define unit-tests
   (make-test-suite
    "Unit Tests"
-   (for/list ([f (list
-                  typecheck-tests
-                  subtype-tests
-                  type-equal-tests
-                  restrict-tests
-                  remove-tests
-                  overlap-tests
-                  parse-type-tests
-                  type-annotation-tests
-                  fv-tests
-                  contract-tests
-                  keyword-tests
-                  interactive-tests
-                  ;; this uses dynamic require because the file fails to compile when there's a test failure
-                  (λ () ((dynamic-require special 'typecheck-special-tests))))])
-     (f))))
-
-
-
-(define go (lambda () unit-tests))
-
-
+   (list 
+    ;; this uses dynamic require because the file fails to compile when there's a test failure
+    (dynamic-require special 'typecheck-special-tests)
+    typecheck-tests
+    subtype-tests
+    type-equal-tests
+    restrict-tests
+    remove-tests
+    overlap-tests
+    parse-type-tests
+    type-annotation-tests
+    fv-tests
+    contract-tests
+    keyword-tests
+    interactive-tests)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt
index 8e9c3e4d72..aa42a8b747 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt
@@ -48,7 +48,7 @@
 
 
 
-(define (contract-tests)
+(define contract-tests
   (test-suite "Contract Tests"
               known-bugs
               (t (-Number . -> . -Number))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt
index 52ff3444a6..1a23856e7e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt
@@ -13,7 +13,7 @@
                 (fv ty*)
                 (list (quote elems) ...))))
 
-(define (fv-tests)
+(define fv-tests
   (test-suite "Tests for fv"
               (fv-t -Number)
               [fv-t (-v a) a]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt
index 7584a0a123..3da6fd5e46 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt
@@ -42,7 +42,7 @@
                        ,(syntax->datum #'form)) (force promised-ns)))))))]))
 
 ;; Add 'only at the toplevel tests'
-(define (interactive-tests)
+(define interactive-tests
   (test-suite "Interactive tests"
 
     (test-form #rx""
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt
index 33c618f7ce..dbae27517e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt
@@ -37,7 +37,7 @@
 (define three (-val 'three))
 (define four (-val 'four))
 
-(define (keyword-tests)
+(define keyword-tests
   (test-suite "Tests for keyword expansion"
 
     [t (-> result) (-> result)]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt
index 64870409f7..8aff4e23f8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt
@@ -73,7 +73,7 @@
 (define B -Boolean)
 (define Sym -Symbol)
 
-(define (parse-type-tests)
+(define parse-type-tests
   (pt-tests
    "parse-type tests"
    [FAIL UNBOUND]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt
index 561d80084a..f99847d259 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt
@@ -11,7 +11,7 @@
      #'(test-suite "Tests for intersect"
                    (test-check (format "Overlap test: ~a ~a" t1 t2) (lambda (a b) (eq? (not (not a)) b)) (overlap t1 t2) res) ...)]))
 
-(define (overlap-tests)
+(define overlap-tests
   (over-tests
    [-Number -Integer #t]))
 
@@ -22,7 +22,7 @@
                    (test-check (format "Restrict test: ~a ~a" t1 t2) type-compare? (restrict t1 t2) res) ...)]))
 
 
-(define (restrict-tests)
+(define restrict-tests
   (restr-tests
    [-Number (Un -Number -Symbol) -Number]
    [-Number -Number -Number]
@@ -50,7 +50,7 @@
        (test-suite "Tests for remove"
                    (test-check (format "Remove test: ~a ~a" t1 t2) type-compare? (remove t1 t2) res) ...))]))
 
-(define (remove-tests)
+(define remove-tests
   (remo-tests
    [(Un -Number -Symbol) -Number -Symbol]
    [-Number -Number (Un)]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
index 8b9b8b2e68..44e723a9cb 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
@@ -37,7 +37,7 @@
                                    (tc-expr ex))
                                #,(syntax-local-eval #'b)))]))
 
-(define (typecheck-special-tests)
+(define typecheck-special-tests
   (test-suite
    "Special Typechecker tests"
    ;; should work but don't -- need expected type
@@ -136,5 +136,3 @@
    [tc-e (in-values*-sequence '(a b c))
          (-seq (one-of/c 'a 'b 'c))]
    ))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt
index 620e2864f2..909d639891 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt
@@ -11,7 +11,7 @@
 (define-syntax-rule (s... imgs var tgt result)
   (test-eq? "test" (substitute-dots (list . imgs) #f 'var tgt) result))
 
-(define (subst-tests)
+(define subst-tests
   (test-suite "Tests for substitution"
               (s -Number a (-v a) -Number)
               (s... (-Number -Boolean) a (make-Function (list (make-arr-dots null -Number (-v a) 'a))) (-Number -Boolean . -> . -Number))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt
index 74abe81dde..f0738d4404 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt
@@ -26,7 +26,7 @@
 (define t1 (-mu T (-lst (Un (-v a) T))))
 (define t2 (unfold t1))
 
-(define (subtype-tests)
+(define subtype-tests
   (subtyping-tests
    ;; trivial examples
    (Univ Univ)
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 a928f511f7..3c01991f6d 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
@@ -25,7 +25,7 @@
                                                (expand 'ann-stx))))
                           ty))
 
-(define (type-annotation-tests)
+(define type-annotation-tests
   (test-suite
    "Type Annotation tests"
    ;; FIXME - ask Ryan
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt
index 5100935fd9..28624a3cf2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt
@@ -26,7 +26,7 @@
 
 (define (fld* t) (make-fld t (datum->syntax #'here 'values) #f))
 
-(define (type-equal-tests)
+(define type-equal-tests
   (te-tests
    [-Number -Number]
    [(Un -Number) -Number]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt
index 58923d994e..9f3c975ca9 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt
@@ -191,7 +191,7 @@
          (make-Path p var))))
 
 
-(define (typecheck-tests)
+(define typecheck-tests
   (test-suite
     "Typechecker tests"
     #reader typed-racket/typed-reader