diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-lang-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-lang-test.rkt
index 6fff500717..6d387e135b 100644
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-lang-test.rkt
+++ b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-lang-test.rkt
@@ -41,8 +41,9 @@
                      (raise exn))))
   d)
 
-(define-runtime-path default-web-root
-  "../../../web-server/default-web-root")
+(define default-web-root
+  (path-only 
+   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
 
 (define example-servlets 
   (build-path default-web-root "htdocs" "lang-servlets/"))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-passwords-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-passwords-test.rkt
index 057f0883c0..4822d86f05 100644
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-passwords-test.rkt
+++ b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-passwords-test.rkt
@@ -6,6 +6,7 @@
          racket/promise
          racket/runtime-path
          racket/list
+         racket/path
          racket/serialize
          web-server/http
          web-server/dispatchers/dispatch
@@ -16,8 +17,9 @@
 (require/expose web-server/dispatchers/dispatch-passwords
                 (read-passwords))
 
-(define-runtime-path default-web-root
-  "../../../web-server/default-web-root")
+(define default-web-root
+  (path-only 
+   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
 
 (define default-passwords (build-path default-web-root "passwords"))
 (define test-passwords (make-temporary-file))
@@ -91,3 +93,7 @@
    ; XXX test refresh cache
    
    ))
+
+(module+ test
+  (require rackunit/text-ui)
+  (run-tests dispatch-passwords-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-servlets-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-servlets-test.rkt
index 4f6bc156b1..c99d9dfba8 100644
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-servlets-test.rkt
+++ b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-servlets-test.rkt
@@ -32,8 +32,9 @@
                      (raise exn))))
   d)
 
-(define-runtime-path default-web-root
-  "../../../web-server/default-web-root")
+(define default-web-root
+  (path-only 
+   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
 (define example-servlets
   (build-path default-web-root "htdocs" "servlets" "examples/"))
 
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/filesystem-map-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/filesystem-map-test.rkt
index d948241563..0dc25e7e97 100644
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/filesystem-map-test.rkt
+++ b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/filesystem-map-test.rkt
@@ -2,6 +2,7 @@
 (require rackunit
          net/url
          racket/list
+         racket/path
          web-server/private/util
          racket/runtime-path
          web-server/dispatchers/filesystem-map)
@@ -11,8 +12,8 @@
   (require rackunit/text-ui)
   (run-tests filesystem-map-tests))
 
-(define-runtime-path base-dir
-  "../../../web-server")
+(define base-dir
+  (path-only (collection-file-path "main.rkt" "web-server")))
 
 (define test-map (make-url->path base-dir))
 (define test-valid-map (make-url->valid-path test-map))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mime-types-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mime-types-test.rkt
index 6422202b68..75f92fd9a1 100644
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mime-types-test.rkt
+++ b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mime-types-test.rkt
@@ -2,6 +2,7 @@
 (require rackunit
          (only-in mzlib/file make-temporary-file)
          racket/runtime-path
+         racket/path
          web-server/http
          web-server/private/mime-types)
 (provide mime-types-tests)
@@ -16,8 +17,9 @@ END
             ))
   #:exists 'replace)  
 
-(define-runtime-path default-web-root
-  "../../../web-server/default-web-root")
+(define default-web-root
+  (path-only 
+   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
 
 (define mime-types-tests
   (test-suite