diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index e99c29945c..adf94a7ac3 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -69,8 +69,8 @@ (define-module (guix scripts substitute)
 (define %narinfo-cache-directory
   ;; A local cache of narinfos, to avoid going to the network.
   (or (and=> (getenv "XDG_CACHE_HOME")
-             (cut string-append <> "/guix/substitute-binary"))
-      (string-append %state-directory "/substitute-binary/cache")))
+             (cut string-append <> "/guix/substitute"))
+      (string-append %state-directory "/substitute/cache")))
 
 (define %allow-unauthenticated-substitutes?
   ;; Whether to allow unchecked substitutes.  This is useful for testing
diff --git a/tests/store.scm b/tests/store.scm
index 8e929bbc4d..f778c2086d 100644
--- a/tests/store.scm
+++ b/tests/store.scm
@@ -372,7 +372,7 @@ (define (same? x y)
         ;; Remove entry from the local cache.
         (false-if-exception
          (delete-file (string-append (getenv "XDG_CACHE_HOME")
-                                     "/guix/substitute-binary/"
+                                     "/guix/substitute/"
                                      (store-path-hash-part o))))
 
         ;; Make sure 'guix substitute' correctly communicates the above
diff --git a/tests/substitute.scm b/tests/substitute.scm
index 5697592423..85698127fa 100644
--- a/tests/substitute.scm
+++ b/tests/substitute.scm
@@ -132,7 +132,7 @@ (define (call-with-narinfo narinfo thunk)
                                                 "GUIX_BINARY_SUBSTITUTE_URL"))
                                   uri-path))
         (cache-directory   (string-append (getenv "XDG_CACHE_HOME")
-                                          "/guix/substitute-binary/")))
+                                          "/guix/substitute/")))
     (dynamic-wind
       (lambda ()
         (when (file-exists? cache-directory)