diff --git a/pkgs/racket-test/tests/pkg/tests-permissions.rkt b/pkgs/racket-test/tests/pkg/tests-permissions.rkt
index b3118cf463..b75ac34bc8 100644
--- a/pkgs/racket-test/tests/pkg/tests-permissions.rkt
+++ b/pkgs/racket-test/tests/pkg/tests-permissions.rkt
@@ -5,7 +5,7 @@
 (this-test-is-run-by-the-main-test)
 
 (pkg-tests
- (define dir (getenv "PLTADDONDIR"))
+ (define dir (find-system-path 'addon-dir))
  (define pkg-dir (build-path dir "pkgs"))
  (define (try-now)
    (shelly-case
diff --git a/pkgs/racket-test/tests/pkg/util.rkt b/pkgs/racket-test/tests/pkg/util.rkt
index d813ff8eef..5eac196247 100644
--- a/pkgs/racket-test/tests/pkg/util.rkt
+++ b/pkgs/racket-test/tests/pkg/util.rkt
@@ -257,10 +257,10 @@
   (initialize-catalogs/git))
 
 (define (initialize-catalogs/git)
-  (define pkg-git.git (make-temporary-file "pkg-git-~a.git"))
-  (delete-file pkg-git.git)
+  (define pkg-git.git (make-temporary-file "pkg-git-~a.git" 'directory))
   (parameterize ([current-directory (build-path test-source-directory "test-pkgs")])
-    (copy-directory/files (build-path test-source-directory "test-pkgs" "pkg-git") pkg-git.git))
+    (for ([f (directory-list "pkg-git")])
+      (copy-directory/files (build-path "pkg-git" f) (build-path pkg-git.git f))))
   (define checksum
     (parameterize ([current-directory pkg-git.git])
       (system "git init")