diff --git a/collects/web-server/tests/all-web-server-tests.ss b/collects/web-server/tests/all-web-server-tests.ss
index cfccb35af4..1a6589768a 100644
--- a/collects/web-server/tests/all-web-server-tests.ss
+++ b/collects/web-server/tests/all-web-server-tests.ss
@@ -1,25 +1,25 @@
 (module all-web-server-tests mzscheme
-  (require (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2))
-           (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2))
-           (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           "./graveyard/persistent-close-test.ss"
-           "./lang/anormal-test.ss"
-           "./lang/labels-test.ss"
-           "./lang/stuff-url-test.ss"
-           "./lang/web-param-test.ss"
-           "./lang-test.ss"
-           "./private/define-closure-test.ss"
-           "./private/request-test.ss"
-           "./servlet-env-test.ss")
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
+           "configuration/all-configuration-tests.ss"
+           "dispatchers/all-dispatchers-tests.ss"           
+           "graveyard/all-graveyard-tests.ss"
+           "lang/all-lang-tests.ss"
+           "lang-test.ss"
+           "managers/all-managers-tests.ss"
+           "private/all-private-tests.ss"
+           "servlet/all-servlet-tests.ss"
+           "servlet-env-test.ss")
+  (provide all-web-server-tests)
   
-  (test/graphical-ui
-   (test-suite
-    "Web Server"
-    persistent-close-tests
-    anormal-tests
-    labels-tests
-    stuff-url-tests
-    web-param-tests
-    lang-tests
-    define-closure-tests
-    request-tests)))
\ No newline at end of file
+  (define all-web-server-tests  
+    (test-suite
+     "Web Server"
+     all-configuration-tests
+     all-dispatchers-tests
+     all-graveyard-tests
+     all-lang-tests
+     lang-tests
+     all-managers-tests
+     all-private-tests
+     all-servlet-tests
+     servlet-env-tests)))
\ No newline at end of file
diff --git a/collects/web-server/tests/configuration/all-configuration-tests.ss b/collects/web-server/tests/configuration/all-configuration-tests.ss
new file mode 100644
index 0000000000..c2544f4690
--- /dev/null
+++ b/collects/web-server/tests/configuration/all-configuration-tests.ss
@@ -0,0 +1,7 @@
+(module all-configuration-tests mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (provide all-configuration-tests)
+  
+  (define all-configuration-tests  
+    (test-suite
+     "Configuration")))
\ No newline at end of file
diff --git a/collects/web-server/tests/dispatchers/all-dispatchers-tests.ss b/collects/web-server/tests/dispatchers/all-dispatchers-tests.ss
new file mode 100644
index 0000000000..ca74759dff
--- /dev/null
+++ b/collects/web-server/tests/dispatchers/all-dispatchers-tests.ss
@@ -0,0 +1,7 @@
+(module all-dispatchers-tests mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (provide all-dispatchers-tests)
+  
+  (define all-dispatchers-tests  
+    (test-suite
+     "Dispatchers")))
\ No newline at end of file
diff --git a/collects/web-server/tests/graveyard/all-graveyard-tests.ss b/collects/web-server/tests/graveyard/all-graveyard-tests.ss
new file mode 100644
index 0000000000..ab6748f53c
--- /dev/null
+++ b/collects/web-server/tests/graveyard/all-graveyard-tests.ss
@@ -0,0 +1,9 @@
+(module all-graveyard-tests mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
+           "persistent-close-test.ss")
+  (provide all-graveyard-tests)
+  
+  (define all-graveyard-tests
+    (test-suite
+     "Graveyard"
+     persistent-close-tests)))
\ No newline at end of file
diff --git a/collects/web-server/tests/graveyard/persistent-close-test.ss b/collects/web-server/tests/graveyard/persistent-close-test.ss
index 83d9320dbf..b1cfe2a01c 100644
--- a/collects/web-server/tests/graveyard/persistent-close-test.ss
+++ b/collects/web-server/tests/graveyard/persistent-close-test.ss
@@ -7,7 +7,7 @@
   
   (define persistent-close-tests
     (test-suite
-     "Tests for persistent-close.ss"
+     "Persistent Closures"
      
      (test-case
       "file-vector references"
diff --git a/collects/web-server/tests/lang-test.ss b/collects/web-server/tests/lang-test.ss
index addac2a6c4..612b1ac6c2 100644
--- a/collects/web-server/tests/lang-test.ss
+++ b/collects/web-server/tests/lang-test.ss
@@ -21,7 +21,7 @@
   
   (define lang-tests
     (test-suite
-     "Test the Web language"
+     "Web Language Servlets"
      
      ;; ****************************************
      ;; ****************************************
diff --git a/collects/web-server/tests/lang/all-lang-tests.ss b/collects/web-server/tests/lang/all-lang-tests.ss
new file mode 100644
index 0000000000..4e3d339c89
--- /dev/null
+++ b/collects/web-server/tests/lang/all-lang-tests.ss
@@ -0,0 +1,15 @@
+(module all-lang-tests mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
+           "anormal-test.ss"
+           "labels-test.ss"
+           "stuff-url-test.ss"
+           "web-param-test.ss")
+  (provide all-lang-tests)
+  
+  (define all-lang-tests  
+    (test-suite
+     "Web Language"
+     anormal-tests
+     labels-tests
+     stuff-url-tests
+     web-param-tests)))
\ No newline at end of file
diff --git a/collects/web-server/tests/lang/anormal-test.ss b/collects/web-server/tests/lang/anormal-test.ss
index d27de6d9c7..9016e0f226 100644
--- a/collects/web-server/tests/lang/anormal-test.ss
+++ b/collects/web-server/tests/lang/anormal-test.ss
@@ -137,7 +137,7 @@
   
   (define anormal-tests
     (test-suite
-     "Tests for Normalization Phase"
+     "Anormalization"
      (test-suite
       "Base Cases"
       
diff --git a/collects/web-server/tests/lang/labels-test.ss b/collects/web-server/tests/lang/labels-test.ss
index 1beb27866c..9b3b6989fe 100644
--- a/collects/web-server/tests/lang/labels-test.ss
+++ b/collects/web-server/tests/lang/labels-test.ss
@@ -77,7 +77,7 @@
   
   (define labels-tests
     (test-suite
-     "Tests for labels.ss"
+     "Module Labeling"
      
      (test-case
       "Test the tag incrementing scheme"
diff --git a/collects/web-server/tests/lang/stuff-url-test.ss b/collects/web-server/tests/lang/stuff-url-test.ss
index a98bb21682..ab243980c1 100644
--- a/collects/web-server/tests/lang/stuff-url-test.ss
+++ b/collects/web-server/tests/lang/stuff-url-test.ss
@@ -27,7 +27,7 @@
   
   (define stuff-url-tests
     (test-suite
-     "Tests for stuff-url.ss"     
+     "Stuff URL"
      
      (test-case
       "compose url-parts and recover-serial (1)"
diff --git a/collects/web-server/tests/lang/web-param-test.ss b/collects/web-server/tests/lang/web-param-test.ss
index a75e6a481e..dbf1d0fc5d 100644
--- a/collects/web-server/tests/lang/web-param-test.ss
+++ b/collects/web-server/tests/lang/web-param-test.ss
@@ -10,7 +10,7 @@
   
   (define web-param-tests
     (test-suite
-     "Test Web Parameters"
+     "Web Parameters"
      
      ;; ****************************************
      ;; ****************************************
diff --git a/collects/web-server/tests/managers/all-managers-tests.ss b/collects/web-server/tests/managers/all-managers-tests.ss
new file mode 100644
index 0000000000..aeaed6be0d
--- /dev/null
+++ b/collects/web-server/tests/managers/all-managers-tests.ss
@@ -0,0 +1,7 @@
+(module all-managers-tests mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (provide all-managers-tests)
+  
+  (define all-managers-tests
+    (test-suite
+     "Continuation Managers")))
\ No newline at end of file
diff --git a/collects/web-server/tests/private/all-private-tests.ss b/collects/web-server/tests/private/all-private-tests.ss
new file mode 100644
index 0000000000..d72f121d6a
--- /dev/null
+++ b/collects/web-server/tests/private/all-private-tests.ss
@@ -0,0 +1,11 @@
+(module all-private-tests mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
+           "define-closure-test.ss"
+           "request-test.ss")
+  (provide all-private-tests)
+  
+  (define all-private-tests
+    (test-suite
+     "Internal"
+     define-closure-tests
+     request-tests)))
\ No newline at end of file
diff --git a/collects/web-server/tests/private/define-closure-test.ss b/collects/web-server/tests/private/define-closure-test.ss
index 79bd271dc6..6ac31cee05 100644
--- a/collects/web-server/tests/private/define-closure-test.ss
+++ b/collects/web-server/tests/private/define-closure-test.ss
@@ -51,7 +51,7 @@
   
   (define define-closure-tests
     (test-suite
-     "Tests for closure.ss"
+     "Define Closure"
      
      (test-case
       "serialize id procedure"
diff --git a/collects/web-server/tests/private/request-test.ss b/collects/web-server/tests/private/request-test.ss
index 04b0a86d82..c7d24859dd 100644
--- a/collects/web-server/tests/private/request-test.ss
+++ b/collects/web-server/tests/private/request-test.ss
@@ -38,13 +38,15 @@
   
   (define request-tests
     (test-suite
-     "tests for parsing bindings"
-     (test-equal? "simple test 1"
-                  (get-post-data/raw "hello world") #"hello world")
-     (test-equal? "simple test 2"
-                  (get-post-data/raw "hello=world") #"hello=world")
-     (test-equal? "simple test 3"
-                  (binding:form-value (bindings-assq #"hello" (get-bindings "hello=world")))
-                  #"world")))
+     "Request Parsing"
+     (test-suite
+      "Bindings"
+      (test-equal? "simple test 1"
+                   (get-post-data/raw "hello world") #"hello world")
+      (test-equal? "simple test 2"
+                   (get-post-data/raw "hello=world") #"hello=world")
+      (test-equal? "simple test 3"
+                   (binding:form-value (bindings-assq #"hello" (get-bindings "hello=world")))
+                   #"world"))))
   
   (provide request-tests))
\ No newline at end of file
diff --git a/collects/web-server/tests/run-all-tests.ss b/collects/web-server/tests/run-all-tests.ss
new file mode 100644
index 0000000000..db3789c854
--- /dev/null
+++ b/collects/web-server/tests/run-all-tests.ss
@@ -0,0 +1,6 @@
+(module run-all-tests mzscheme
+  (require (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2))
+           (planet "text-ui.ss" ("schematics" "schemeunit.plt" 2))
+           "all-web-server-tests.ss")
+  
+  (test/graphical-ui all-web-server-tests))
\ No newline at end of file
diff --git a/collects/web-server/tests/servlet-env-test.ss b/collects/web-server/tests/servlet-env-test.ss
index 4cf362d43a..6b7d57e950 100644
--- a/collects/web-server/tests/servlet-env-test.ss
+++ b/collects/web-server/tests/servlet-env-test.ss
@@ -1,5 +1,13 @@
 (module servlet-env-test mzscheme
-  (require (lib "servlet-env.ss" "web-server"))
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
+           (lib "servlet-env.ss" "web-server"))
+  (provide servlet-env-tests)
+  
+  (define servlet-env-tests
+    (test-suite
+     "Servlet Environment"))
+
+  ; XXX Turn below into tests
   
   ; request-number : str -> num
   (define (request-number which-number)
diff --git a/collects/web-server/tests/servlet/all-servlet-tests.ss b/collects/web-server/tests/servlet/all-servlet-tests.ss
new file mode 100644
index 0000000000..af16e76a6f
--- /dev/null
+++ b/collects/web-server/tests/servlet/all-servlet-tests.ss
@@ -0,0 +1,7 @@
+(module all-servlet-tests mzscheme
+  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
+  (provide all-servlet-tests)
+  
+  (define all-servlet-tests
+    (test-suite
+     "Servlet")))
\ No newline at end of file