diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/cm.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/cm.rktl
index 29f6c049df..27f54a9eeb 100644
--- a/pkgs/racket-pkgs/racket-test/tests/racket/cm.rktl
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/cm.rktl
@@ -137,12 +137,12 @@
 ;; ----------------------------------------
 
 ;; test `file-stamp-in-paths'
-(test (file-or-directory-modify-seconds (build-path (collection-path "file") 
+(test (file-or-directory-modify-seconds (build-path (path-only (collection-file-path "zip.rkt" "file"))
                                                     "compiled"
-                                                    "gif_rkt.zo"))
+                                                    "zip_rkt.zo"))
       car
       (file-stamp-in-collection
-       (build-path (collection-path "file") "gif.rkt")))
+       (collection-file-path "zip.rkt" "file")))
 ;; check bytecode without a source:
 (let ([f (build-path dir "compiled" "nosrc_rkt.zo")])
   (with-output-to-file f #:exists 'truncate (lambda () (write (compile #'(module nosrc racket/base)))))
@@ -152,11 +152,10 @@
          (build-path dir "nosrc.rkt")
          (list dir))))
 ;; setup/main doesn't have a .zo:
-(test (file-or-directory-modify-seconds (build-path (collection-path "setup") 
-                                                    "main.rkt"))
+(test (file-or-directory-modify-seconds (collection-file-path "main.rkt" "setup"))
       car
       (file-stamp-in-collection
-       (build-path (collection-path "setup") "main.rkt")))
+       (collection-file-path "main.rkt" "setup")))
 
 ;; ----------------------------------------
 
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/moddep.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/moddep.rktl
index 82e27fb847..f88892f5fd 100644
--- a/pkgs/racket-pkgs/racket-test/tests/racket/moddep.rktl
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/moddep.rktl
@@ -59,12 +59,14 @@
       (module-path-index-join #f #f)
       (build-path (current-directory) "only.rkt"))
 
+;; The "mzlib" and "ffi" collections are chosen to exist only in main "collects",
+;; but that's fragile.
 (let ([mzlib (collection-path "mzlib")]
-      [syntax (collection-path "syntax")])
+      [ffi (collection-path "ffi")])
   (test-rmp (build-path mzlib "x.rkt") '(lib "x.ss") #f)
   (test-rmp (build-path mzlib "x.rkt") '(lib "x.ss" "mzlib") #f)
-  (test-rmp (build-path syntax "x.rkt") '(lib "x.ss" "syntax") #f)
-  (test-rmp (build-path syntax "private" "x.rkt") '(lib "x.ss" "syntax" "private") #f)
+  (test-rmp (build-path ffi "x.rkt") '(lib "x.ss" "ffi") #f)
+  (test-rmp (build-path ffi "unsafe" "x.rkt") '(lib "x.ss" "ffi" "unsafe") #f)
   (test-rmp (build-path (current-directory) "x.rkt") `(file ,(path->string (build-path (current-directory) "x.ss"))) #f)
   (test-rmp (build-path (current-directory) "x.rkt") (build-path (current-directory) "x.ss") #f)
   (test-rmp (build-path (current-directory) "x.rkt") (build-path "x.ss") #f)
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/sandbox.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/sandbox.rktl
index fec2780b13..2e8417264d 100644
--- a/pkgs/racket-pkgs/racket-test/tests/racket/sandbox.rktl
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/sandbox.rktl
@@ -307,7 +307,7 @@
    --top--
    (let* ([tmp       (make-temporary-file "sandboxtest~a" 'directory)]
           [strpath   (lambda xs (path->string (apply build-path xs)))]
-          [racketlib (strpath (collection-path "racket"))]
+          [racketlib (strpath (path-only (collection-file-path "main.rkt" "racket")))]
           [list-lib  (strpath racketlib "list.rkt")]
           [list-zo   (strpath racketlib "compiled" "list_rkt.zo")]
           [test-lib  (strpath tmp "sandbox-test.rkt")]