diff --git a/tests/functional/local-overlay-store/add-lower-inner.sh b/tests/functional/local-overlay-store/add-lower-inner.sh
index ca7db7ab6..4efa7d088 100755
--- a/tests/functional/local-overlay-store/add-lower-inner.sh
+++ b/tests/functional/local-overlay-store/add-lower-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/bad-uris.sh b/tests/functional/local-overlay-store/bad-uris.sh
index 07b2c6f28..2517681dd 100644
--- a/tests/functional/local-overlay-store/bad-uris.sh
+++ b/tests/functional/local-overlay-store/bad-uris.sh
@@ -2,7 +2,7 @@ source common.sh
 
 requireEnvironment
 setupConfig
-storeDirs
+setupStoreDirs
 
 mkdir -p $TEST_ROOT/bad_test
 badTestRoot=$TEST_ROOT/bad_test
@@ -18,7 +18,7 @@ for i in "${storesBad[@]}"; do
     echo $i
     unshare --mount --map-root-user bash <<EOF
         source common.sh
-        storeDirs
+        setupStoreDirs
         mountOverlayfs
         expectStderr 1 nix doctor --store "$i" | grepQuiet "overlay filesystem .* mounted incorrectly"
 EOF
diff --git a/tests/functional/local-overlay-store/build-inner.sh b/tests/functional/local-overlay-store/build-inner.sh
index beb40b2fc..1f3ddded7 100755
--- a/tests/functional/local-overlay-store/build-inner.sh
+++ b/tests/functional/local-overlay-store/build-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/check-post-init-inner.sh b/tests/functional/local-overlay-store/check-post-init-inner.sh
index 0f4654cc2..ccc0461a3 100755
--- a/tests/functional/local-overlay-store/check-post-init-inner.sh
+++ b/tests/functional/local-overlay-store/check-post-init-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/common.sh b/tests/functional/local-overlay-store/common.sh
index bd144c925..0de688eb4 100644
--- a/tests/functional/local-overlay-store/common.sh
+++ b/tests/functional/local-overlay-store/common.sh
@@ -18,7 +18,7 @@ setupConfig () {
 
 enableFeatures "local-overlay-store"
 
-storeDirs () {
+setupStoreDirs () {
   # Attempt to create store dirs on tmpfs volume.
   # This ensures lowerdir, upperdir and workdir will be on
   # a consistent filesystem that fully supports OverlayFS.
diff --git a/tests/functional/local-overlay-store/delete-duplicate-inner.sh b/tests/functional/local-overlay-store/delete-duplicate-inner.sh
index 6053451d8..4f3ff25bd 100644
--- a/tests/functional/local-overlay-store/delete-duplicate-inner.sh
+++ b/tests/functional/local-overlay-store/delete-duplicate-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/delete-refs-inner.sh b/tests/functional/local-overlay-store/delete-refs-inner.sh
index 0702d1693..e24f34a85 100644
--- a/tests/functional/local-overlay-store/delete-refs-inner.sh
+++ b/tests/functional/local-overlay-store/delete-refs-inner.sh
@@ -8,7 +8,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/gc-inner.sh b/tests/functional/local-overlay-store/gc-inner.sh
index 01ec48b84..ea92154d2 100644
--- a/tests/functional/local-overlay-store/gc-inner.sh
+++ b/tests/functional/local-overlay-store/gc-inner.sh
@@ -8,7 +8,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/optimise-inner.sh b/tests/functional/local-overlay-store/optimise-inner.sh
index b7994054c..eafbc77f7 100755
--- a/tests/functional/local-overlay-store/optimise-inner.sh
+++ b/tests/functional/local-overlay-store/optimise-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/redundant-add-inner.sh b/tests/functional/local-overlay-store/redundant-add-inner.sh
index 34b841e38..71899a9a7 100755
--- a/tests/functional/local-overlay-store/redundant-add-inner.sh
+++ b/tests/functional/local-overlay-store/redundant-add-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/stale-file-handle-inner.sh b/tests/functional/local-overlay-store/stale-file-handle-inner.sh
index 86e39fa40..d38f00cdc 100755
--- a/tests/functional/local-overlay-store/stale-file-handle-inner.sh
+++ b/tests/functional/local-overlay-store/stale-file-handle-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore
 
diff --git a/tests/functional/local-overlay-store/verify-inner.sh b/tests/functional/local-overlay-store/verify-inner.sh
index 64d3b63c1..c98ea1f96 100755
--- a/tests/functional/local-overlay-store/verify-inner.sh
+++ b/tests/functional/local-overlay-store/verify-inner.sh
@@ -10,7 +10,7 @@ source common.sh
 unset NIX_STORE_DIR
 unset NIX_STATE_DIR
 
-storeDirs
+setupStoreDirs
 
 initLowerStore