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"