diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl
index 0fd27bd8c4..1fd8097e99 100644
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl
+++ b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl
@@ -2,7 +2,7 @@
 ;; Basic checks for the advanced language. See also
 ;;  beginner.rkt
 
-(load-relative "../racket/loadtest.rktl")
+(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner-abbr.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner-abbr.rktl
index 1450233e7c..4f1cd5501d 100644
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner-abbr.rktl
+++ b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner-abbr.rktl
@@ -10,7 +10,7 @@
 ;; Don't try to run other tests from the test suite after loading this
 ;; one into a particular namespace.
 
-(load-relative "../racket/loadtest.rktl")
+(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner.rktl
index fdfb8eb9c4..d46ecdee82 100644
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner.rktl
+++ b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner.rktl
@@ -49,7 +49,7 @@
 ;;     removes the last <n> added expressions
 ;;
 
-(load-relative "../racket/loadtest.rktl")
+(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
 
 ;; Check that expansion doesn't introduce non-equal ids that
 ;;  claim to be "original" at the same place
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-test.rktl
index 82cb35c1ff..4fe666d3dd 100644
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-test.rktl
+++ b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-test.rktl
@@ -71,7 +71,7 @@
                        (let ([locs ((exn:srclocs-accessor x) x)])
                          (and (not (empty? locs))
                               (andmap (lambda (s) (and (srcloc-source s)
-                                                       (regexp-match #rx"collects[/\\]tests" (srcloc-source s))
+                                                       (regexp-match #rx"htdp-test[/\\]tests" (srcloc-source s))
                                                        (srcloc-position s) (srcloc-span s))) 
 
                                       locs))))))]))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate-lambda.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate-lambda.rktl
index b2bc3a5c99..51c5341a79 100644
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate-lambda.rktl
+++ b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate-lambda.rktl
@@ -2,7 +2,7 @@
 ;; Basic checks for the intermediate language. See also
 ;;  beginner.rktl
 
-(load-relative "../racket/loadtest.rktl")
+(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate.rktl
index fc4eaa51c6..d728f1e746 100644
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate.rktl
+++ b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate.rktl
@@ -2,7 +2,7 @@
 ;; Basic checks for the intermediate language. See also
 ;;  beginner.rktl
 
-(load-relative "../racket/loadtest.rktl")
+(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)