diff --git a/collects/tests/racket/advanced.rktl b/collects/tests/htdp-lang/advanced.rktl
similarity index 99%
rename from collects/tests/racket/advanced.rktl
rename to collects/tests/htdp-lang/advanced.rktl
index ad728409a3..6eb03ae847 100644
--- a/collects/tests/racket/advanced.rktl
+++ b/collects/tests/htdp-lang/advanced.rktl
@@ -2,7 +2,7 @@
 ;; Basic checks for the advanced language. See also
 ;;  beginner.ss
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)
diff --git a/collects/tests/racket/beg-adv.rktl b/collects/tests/htdp-lang/beg-adv.rktl
similarity index 100%
rename from collects/tests/racket/beg-adv.rktl
rename to collects/tests/htdp-lang/beg-adv.rktl
diff --git a/collects/tests/racket/beg-bega.rktl b/collects/tests/htdp-lang/beg-bega.rktl
similarity index 100%
rename from collects/tests/racket/beg-bega.rktl
rename to collects/tests/htdp-lang/beg-bega.rktl
diff --git a/collects/tests/racket/beg-intm.rktl b/collects/tests/htdp-lang/beg-intm.rktl
similarity index 100%
rename from collects/tests/racket/beg-intm.rktl
rename to collects/tests/htdp-lang/beg-intm.rktl
diff --git a/collects/tests/racket/beg-intml.rktl b/collects/tests/htdp-lang/beg-intml.rktl
similarity index 100%
rename from collects/tests/racket/beg-intml.rktl
rename to collects/tests/htdp-lang/beg-intml.rktl
diff --git a/collects/tests/racket/bega-adv.rktl b/collects/tests/htdp-lang/bega-adv.rktl
similarity index 100%
rename from collects/tests/racket/bega-adv.rktl
rename to collects/tests/htdp-lang/bega-adv.rktl
diff --git a/collects/tests/racket/beginner-abbr.rktl b/collects/tests/htdp-lang/beginner-abbr.rktl
similarity index 95%
rename from collects/tests/racket/beginner-abbr.rktl
rename to collects/tests/htdp-lang/beginner-abbr.rktl
index 9fe7f74513..1450233e7c 100644
--- a/collects/tests/racket/beginner-abbr.rktl
+++ b/collects/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 "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)
diff --git a/collects/tests/racket/beginner.rktl b/collects/tests/htdp-lang/beginner.rktl
similarity index 98%
rename from collects/tests/racket/beginner.rktl
rename to collects/tests/htdp-lang/beginner.rktl
index 2a54310dd8..07c720afdb 100644
--- a/collects/tests/racket/beginner.rktl
+++ b/collects/tests/htdp-lang/beginner.rktl
@@ -49,7 +49,7 @@
 ;;     removes the last <n> added expressions
 ;;
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Check that expansion doesn't introduce non-equal ids that
 ;;  claim to be "original" at the same place
diff --git a/collects/tests/racket/htdp-image.rktl b/collects/tests/htdp-lang/htdp-image.rktl
similarity index 99%
rename from collects/tests/racket/htdp-image.rktl
rename to collects/tests/htdp-lang/htdp-image.rktl
index ae2bda0e6f..41bce43b18 100644
--- a/collects/tests/racket/htdp-image.rktl
+++ b/collects/tests/htdp-lang/htdp-image.rktl
@@ -1,6 +1,6 @@
 ;; Load this one with GRacket
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 (require teachpack/htdp/image
          htdp/error
          lang/posn
diff --git a/collects/tests/racket/htdp-test.rktl b/collects/tests/htdp-lang/htdp-test.rktl
similarity index 100%
rename from collects/tests/racket/htdp-test.rktl
rename to collects/tests/htdp-lang/htdp-test.rktl
diff --git a/collects/tests/htdp-lang/htdp.rktl b/collects/tests/htdp-lang/htdp.rktl
new file mode 100644
index 0000000000..ba37f4ff8c
--- /dev/null
+++ b/collects/tests/htdp-lang/htdp.rktl
@@ -0,0 +1,15 @@
+(let ([ol (current-load)]) 
+  (current-load
+   (λ x
+     (printf "cl ~s\n" x)
+     (apply ol x))))
+   
+(load-relative "../racket/loadtest.rktl")
+
+(load-in-sandbox "beginner.rktl" #:testing "../racket/testing.rktl") 
+(load-in-sandbox "beginner-abbr.rktl" #:testing "../racket/testing.rktl")
+(load-in-sandbox "intermediate.rktl" #:testing "../racket/testing.rktl")
+(load-in-sandbox "intermediate-lambda.rktl" #:testing "../racket/testing.rktl")
+(load-in-sandbox "advanced.rktl" #:testing "../racket/testing.rktl")
+
+(report-errs)
diff --git a/collects/tests/racket/intermediate-lambda.rktl b/collects/tests/htdp-lang/intermediate-lambda.rktl
similarity index 95%
rename from collects/tests/racket/intermediate-lambda.rktl
rename to collects/tests/htdp-lang/intermediate-lambda.rktl
index 3f7b2eca75..b6ac3a2fe7 100644
--- a/collects/tests/racket/intermediate-lambda.rktl
+++ b/collects/tests/htdp-lang/intermediate-lambda.rktl
@@ -2,7 +2,7 @@
 ;; Basic checks for the intermediate language. See also
 ;;  beginner.rktl
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)
diff --git a/collects/tests/racket/intermediate.rktl b/collects/tests/htdp-lang/intermediate.rktl
similarity index 95%
rename from collects/tests/racket/intermediate.rktl
rename to collects/tests/htdp-lang/intermediate.rktl
index 2637008077..a4eb8c96e1 100644
--- a/collects/tests/racket/intermediate.rktl
+++ b/collects/tests/htdp-lang/intermediate.rktl
@@ -2,7 +2,7 @@
 ;; Basic checks for the intermediate language. See also
 ;;  beginner.rktl
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)
diff --git a/collects/tests/racket/intm-adv.rktl b/collects/tests/htdp-lang/intm-adv.rktl
similarity index 100%
rename from collects/tests/racket/intm-adv.rktl
rename to collects/tests/htdp-lang/intm-adv.rktl
diff --git a/collects/tests/racket/intm-intml.rktl b/collects/tests/htdp-lang/intm-intml.rktl
similarity index 100%
rename from collects/tests/racket/intm-intml.rktl
rename to collects/tests/htdp-lang/intm-intml.rktl
diff --git a/collects/tests/racket/intmlam-adv.rktl b/collects/tests/htdp-lang/intmlam-adv.rktl
similarity index 100%
rename from collects/tests/racket/intmlam-adv.rktl
rename to collects/tests/htdp-lang/intmlam-adv.rktl
diff --git a/collects/tests/racket/htdp.rktl b/collects/tests/racket/htdp.rktl
deleted file mode 100644
index 00ff6cf4f6..0000000000
--- a/collects/tests/racket/htdp.rktl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(load-in-sandbox "beginner.rktl")
-(load-in-sandbox "beginner-abbr.rktl")
-(load-in-sandbox "intermediate.rktl")
-(load-in-sandbox "intermediate-lambda.rktl")
-(load-in-sandbox "advanced.rktl")
-
-(report-errs)
diff --git a/collects/tests/racket/testing.rktl b/collects/tests/racket/testing.rktl
index 437a72b412..38338522d6 100644
--- a/collects/tests/racket/testing.rktl
+++ b/collects/tests/racket/testing.rktl
@@ -74,7 +74,7 @@ transcript.
 (define number-of-error-tests 0)
 (define number-of-exn-tests 0)
 
-(define (load-in-sandbox file)
+(define (load-in-sandbox file #:testing [testing "testing.rktl"])
   (define-syntax-rule (S id) (dynamic-require 'racket/sandbox 'id))
   (let ([e ((S call-with-trusted-sandbox-configuration)
             (lambda ()
@@ -83,7 +83,7 @@ transcript.
                              [(S sandbox-error-output) current-error-port]
                              [(S sandbox-memory-limit) 100]) ; 100mb per box
                 ((S make-evaluator) '(begin) #:requires (list 'racket)))))])
-    (e `(load-relative "testing.rktl"))
+    (e `(load-relative ,testing))
     (e `(define real-output-port (quote ,real-output-port)))
     (e `(define real-error-port  (quote ,real-error-port)))
     (e `(define Section-prefix ,Section-prefix))