diff --git a/pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/demod-test.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/demod-test.rkt
index 5d88fbc82a..a10efce85e 100644
--- a/pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/demod-test.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/demod-test.rkt
@@ -1,6 +1,7 @@
 #lang racket
 (require tests/eli-tester
-         racket/runtime-path)
+         racket/runtime-path
+         compiler/find-exe)
 
 (define (capture-output command . args)
   (define o (open-output-string))
@@ -14,7 +15,7 @@
 (define (test-on-program filename)
   ; run modular program, capture output
   (define-values (modular-output modular-error)
-    (capture-output (find-executable-path "racket") filename))
+    (capture-output (find-exe) filename))
   
   (define demod-filename 
     (let-values ([(base filename dir?) (split-path filename)])
@@ -25,11 +26,11 @@
   
   ; demodularize
   (parameterize ([current-input-port (open-input-string "")])
-    (system* (find-executable-path "raco") "demod" "-o" demod-filename filename))
+    (system* (find-exe) "-l-" "raco" "demod" "-o" demod-filename filename))
   
   ; run whole program
   (define-values (whole-output whole-error)
-    (capture-output (find-executable-path "racket") demod-filename))
+    (capture-output (find-exe) demod-filename))
   
   ; compare output 
   (test
diff --git a/pkgs/racket-pkgs/racket-test/tests/compiler/zo-test.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/zo-test.rkt
index 5c7694085f..20158c5404 100755
--- a/pkgs/racket-pkgs/racket-test/tests/compiler/zo-test.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/compiler/zo-test.rkt
@@ -7,6 +7,7 @@ exec racket -t "$0" -- -s -t 60 -v -R $*
 (require setup/dirs
          racket/runtime-path
          racket/future
+         compiler/find-exe
          "zo-test-util.rkt")
 
 (define ((make-recorder! ht) file phase)
@@ -63,7 +64,7 @@ exec racket -t "$0" -- -s -t 60 -v -R $*
      (! p-str)]))
 
 (define-runtime-path zo-test-worker-path "zo-test-worker.rkt")
-(define racket-path (path->string (find-executable-path "racket")))
+(define racket-path (path->string (find-exe)))
 
 (define p
   (command-line #:program "zo-test" 
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/common/auto.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/common/auto.rkt
index 3696270943..1571841ac6 100755
--- a/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/common/auto.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/common/auto.rkt
@@ -18,7 +18,8 @@ exec racket -qu "$0" ${1+"$@"}
            dynext/file
            syntax/toplevel
            scheme/runtime-path
-           racket/port)
+           racket/port
+           compiler/find-exe)
 
   ;; Implementaton-specific control functions ------------------------------
 
@@ -363,7 +364,7 @@ exec racket -qu "$0" ${1+"$@"}
                 void
                 mk-racket
                 (lambda (bm)
-                  (system (format "racket -u ~a.rkt" bm)))
+                  (system* (find-exe) "-u" (format "~a.rkt" bm)))
                 extract-racket-times
                 clean-up-zo
                 racket-skip-progs)
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/shootout/auto.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/shootout/auto.rkt
index add3fee3d1..eaf0676383 100755
--- a/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/shootout/auto.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/shootout/auto.rkt
@@ -18,7 +18,8 @@ exec racket -qu "$0" ${1+"$@"}
            mzlib/file
            dynext/file
            syntax/toplevel
-           scheme/runtime-path)
+           scheme/runtime-path
+           compiler/find-exe)
 
   ;; Implementaton-specific control functions ------------------------------
 
@@ -80,7 +81,7 @@ exec racket -qu "$0" ${1+"$@"}
                 void
                 mk-racket
                 (lambda (bm)
-                  (system (format "racket run.rkt ~a racket" bm)))
+                  (system* (find-exe) "run.rkt" bm "racket"))
                 extract-racket-times
                 clean-up-zo
                 '())
@@ -88,7 +89,7 @@ exec racket -qu "$0" ${1+"$@"}
                 void
                 mk-typed-racket-non-optimizing
                 (lambda (bm)
-                  (system (format "racket run.rkt ~a typed-racket-non-optimizing" bm)))
+                  (system* (find-exe) "run.rkt" bm "typed-racket-non-optimizing"))
                 extract-racket-times
                 clean-up-typed
                 '())
@@ -96,7 +97,7 @@ exec racket -qu "$0" ${1+"$@"}
                 void
                 mk-typed-racket
                 (lambda (bm)
-                  (system (format "racket run.rkt ~a typed-racket" bm)))
+                  (system* (find-exe) "run.rkt" bm "typed-racket"))
                 extract-racket-times
                 clean-up-typed
                 '())
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench.rkt
index f205a5306a..4937d8cf22 100644
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench.rkt
+++ b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench.rkt
@@ -1,10 +1,10 @@
 #lang racket/base
 (require tests/stress
          racket/system
-         racket/runtime-path)
+         racket/runtime-path
+         compiler/find-exe)
 
-(define racket-pth
-  (find-executable-path "racket"))
+(define racket-pth (find-exe))
 
 (define-runtime-path ttt:raw "ttt-bench-raw.rkt")
 (define-runtime-path ttt:ctc "ttt-bench-ctc.rkt")