diff --git a/collects/tests/typed-scheme/main.ss b/collects/tests/typed-scheme/main.ss
index b4fe5d20..76e7a139 100644
--- a/collects/tests/typed-scheme/main.ss
+++ b/collects/tests/typed-scheme/main.ss
@@ -86,7 +86,7 @@
 
 (define (go) (test/gui tests))
 (define (go/text) (test/text-ui tests))
-
+(go/text)
 (when (getenv "PLT_TESTS")
   (unless (parameterize ([current-output-port (open-output-string)])
             (= 0 (go/text)))
diff --git a/collects/tests/typed-scheme/unit-tests/all-tests.ss b/collects/tests/typed-scheme/unit-tests/all-tests.ss
index 1fe728d0..ec859fed 100644
--- a/collects/tests/typed-scheme/unit-tests/all-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/all-tests.ss
@@ -2,6 +2,7 @@
 
 (require 
  "test-utils.ss"
+ "planet-requires.ss"
  "typecheck-tests.ss"
  "subtype-tests.ss" ;; done
  "type-equal-tests.ss" ;; done
@@ -12,9 +13,8 @@
  "subst-tests.ss"
  "infer-tests.ss")
 
-(require (utils planet-requires) (r:infer infer infer-dummy))
-
-(require (schemeunit))
+(require (r:infer infer infer-dummy)
+         (schemeunit))
 
 (provide unit-tests)
 
diff --git a/collects/tests/typed-scheme/unit-tests/infer-tests.ss b/collects/tests/typed-scheme/unit-tests/infer-tests.ss
index aef624b7..bf3b7b95 100644
--- a/collects/tests/typed-scheme/unit-tests/infer-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/infer-tests.ss
@@ -1,11 +1,10 @@
 #lang scheme/base
-(require "test-utils.ss" (for-syntax scheme/base))
-(require (utils planet-requires)
-	 (rep type-rep)
+(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require (rep type-rep)
 	 (r:infer infer)
 	 (private type-effect-convenience union type-utils)
-         (prefix-in table: (utils tables)))
-(require (schemeunit)) 
+         (prefix-in table: (utils tables))
+         (schemeunit))
 
 
 
diff --git a/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss b/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss
index fedf84fb..b40e131b 100644
--- a/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/parse-type-tests.ss
@@ -1,17 +1,16 @@
 #lang scheme/base
-(require "test-utils.ss" (for-syntax scheme/base))
-(require (utils planet-requires tc-utils)
+(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require (utils tc-utils)
 	 (env type-alias-env type-environments type-name-env init-envs)
 	 (rep type-rep)
 	 (private type-comparison parse-type subtype
-		  union type-utils))
+		  union type-utils)
+         (schemeunit))
 
 (require (rename-in (private type-effect-convenience) [-> t:->])
          (except-in (private base-types) Un)
          (for-template (private base-types)))
 
-(require (schemeunit))
-
 (provide parse-type-tests)
 
 ;; HORRIBLE HACK!
diff --git a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss
index 20da5c73..e18cd04b 100644
--- a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.ss
@@ -1,11 +1,9 @@
 #lang scheme/base
-(require "test-utils.ss" (for-syntax scheme/base))
+(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
 (require (rep type-rep)
-	 (utils planet-requires)
 	 (r:infer infer)
-	 (private type-effect-convenience remove-intersect subtype union))
-
-(require (schemeunit))
+	 (private type-effect-convenience remove-intersect subtype union)
+         (schemeunit))
 
 (define-syntax (restr-tests stx)    
   (syntax-case stx ()
diff --git a/collects/tests/typed-scheme/unit-tests/subst-tests.ss b/collects/tests/typed-scheme/unit-tests/subst-tests.ss
index 10a35fc9..91d42cd4 100644
--- a/collects/tests/typed-scheme/unit-tests/subst-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/subst-tests.ss
@@ -1,10 +1,9 @@
 #lang scheme/base
 
-(require "test-utils.ss" (for-syntax scheme/base))
-(require (utils planet-requires)
-	 (rep type-rep)
-	 (private type-utils type-effect-convenience))
-(require (schemeunit))
+(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require (rep type-rep)
+	 (private type-utils type-effect-convenience)
+         (schemeunit))
 
 (define-syntax-rule (s img var tgt result)
   (test-eq? "test" (substitute img 'var tgt) result))
diff --git a/collects/tests/typed-scheme/unit-tests/subtype-tests.ss b/collects/tests/typed-scheme/unit-tests/subtype-tests.ss
index 83bb3e9a..6aac041a 100644
--- a/collects/tests/typed-scheme/unit-tests/subtype-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/subtype-tests.ss
@@ -1,15 +1,12 @@
 #lang scheme/base
 
-(require "test-utils.ss")
+(require "test-utils.ss" "planet-requires.ss")
 
 (require (private subtype type-effect-convenience union)
 	 (rep type-rep)
-	 (utils planet-requires)
 	 (env init-envs type-environments)
-	 (r:infer infer infer-dummy))
-
-
-(require (schemeunit)
+	 (r:infer infer infer-dummy)
+         (schemeunit)
          (for-syntax scheme/base))
 
 (provide subtype-tests)
diff --git a/collects/tests/typed-scheme/unit-tests/test-utils.ss b/collects/tests/typed-scheme/unit-tests/test-utils.ss
index b160cacd..9c409439 100644
--- a/collects/tests/typed-scheme/unit-tests/test-utils.ss
+++ b/collects/tests/typed-scheme/unit-tests/test-utils.ss
@@ -1,15 +1,16 @@
 #lang scheme/base
 (provide (all-defined-out))
 
-(require scheme/require-syntax
+(require "planet-requires.ss"
+         scheme/require-syntax
          scheme/match
 	 typed-scheme/utils/utils
          (for-syntax scheme/base))
 
 
-(require (utils planet-requires) (private type-comparison type-utils))
+(require (private type-comparison type-utils)
+         (schemeunit))
 (provide private typecheck (rename-out [infer r:infer]) utils env rep)
-(require (schemeunit))
 
 (define (mk-suite ts)
   (match (map (lambda (f) (f)) ts)
diff --git a/collects/tests/typed-scheme/unit-tests/type-equal-tests.ss b/collects/tests/typed-scheme/unit-tests/type-equal-tests.ss
index 899b8e1e..1e4c5c22 100644
--- a/collects/tests/typed-scheme/unit-tests/type-equal-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/type-equal-tests.ss
@@ -1,9 +1,9 @@
 #lang scheme/base
 
-(require "test-utils.ss" (for-syntax scheme/base))
-(require (utils planet-requires) (rep type-rep)
-	 (private type-comparison type-effect-convenience union subtype))
-(require (schemeunit))
+(require "test-utils.ss" "planet-requires.ss" (for-syntax scheme/base))
+(require (rep type-rep)
+	 (private type-comparison type-effect-convenience union subtype)
+         (schemeunit))
 
 (provide type-equal-tests)
 
diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss b/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss
index 5506b1ff..0be4c518 100644
--- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss
+++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss
@@ -1,21 +1,20 @@
 #lang scheme/base
 
-(require "test-utils.ss" 
+(require "test-utils.ss" "planet-requires.ss"
          (for-syntax scheme/base)
          (for-template scheme/base))
 (require (private base-env mutated-vars type-utils union prims type-effect-convenience type-annotation)
 	 (typecheck typechecker)
 	 (rep type-rep effect-rep)
-         (utils tc-utils planet-requires)
-         (env type-name-env type-environments init-envs))
+         (utils tc-utils)
+         (env type-name-env type-environments init-envs)
+         (schemeunit))
 
 (require (for-syntax (utils tc-utils)
                      (typecheck typechecker)
 	             (env type-env)
 	             (private base-env))
          (for-template (private base-env base-types)))
-(require (schemeunit))
-