655 files changed, 480 insertions, 387 deletions

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 12120bdb3..7544f07a6 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -20,4 +20,4 @@
   # Unit tests
   - src/*/tests/**/*
   # Functional and integration tests
-  - tests/**/*
+  - tests/functional/**/*
diff --git a/.gitignore b/.gitignore
index bf4f33564..1e1361f5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,14 +41,14 @@ perl/Makefile.config
 /src/libexpr/parser-tab.hh
 /src/libexpr/parser-tab.output
 /src/libexpr/nix.tbl
-/src/libexpr/tests/libnixexpr-tests
+/tests/unit/libexpr/libnixexpr-tests
 
 # /src/libstore/
 *.gen.*
-/src/libstore/tests/libnixstore-tests
+/tests/unit/libstore/libnixstore-tests
 
 # /src/libutil/
-/src/libutil/tests/libnixutil-tests
+/tests/unit/libutil/libnixutil-tests
 
 /src/nix/nix
 
@@ -79,24 +79,24 @@ perl/Makefile.config
 
 /src/build-remote/build-remote
 
-# /tests/
-/tests/test-tmp
-/tests/common/vars-and-functions.sh
-/tests/result*
-/tests/restricted-innocent
-/tests/shell
-/tests/shell.drv
-/tests/config.nix
-/tests/ca/config.nix
-/tests/dyn-drv/config.nix
-/tests/repl-result-out
-/tests/test-libstoreconsumer/test-libstoreconsumer
-
-# /tests/lang/
-/tests/lang/*.out
-/tests/lang/*.out.xml
-/tests/lang/*.err
-/tests/lang/*.ast
+# /tests/functional/
+/tests/functional/test-tmp
+/tests/functional/common/vars-and-functions.sh
+/tests/functional/result*
+/tests/functional/restricted-innocent
+/tests/functional/shell
+/tests/functional/shell.drv
+/tests/functional/config.nix
+/tests/functional/ca/config.nix
+/tests/functional/dyn-drv/config.nix
+/tests/functional/repl-result-out
+/tests/functional/test-libstoreconsumer/test-libstoreconsumer
+
+# /tests/functional/lang/
+/tests/functional/lang/*.out
+/tests/functional/lang/*.out.xml
+/tests/functional/lang/*.err
+/tests/functional/lang/*.ast
 
 /perl/lib/Nix/Config.pm
 /perl/lib/Nix/Store.cc
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index facbf0eb0..8908b9887 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,7 +52,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
 
    - [ ] Fixes an [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) issue
    - [ ] Tests, as appropriate:
-     - Functional tests – [`tests/**.sh`](./tests)
+     - Functional tests – [`tests/functional/**.sh`](./tests/functional)
      - Unit tests – [`src/*/tests`](./src/)
      - Integration tests – [`tests/nixos/*`](./tests/nixos)
    - [ ] User documentation in the [manual](..doc/manual/src)
diff --git a/Makefile b/Makefile
index 31b54b93d..41c0ab68a 100644
--- a/Makefile
+++ b/Makefile
@@ -23,14 +23,17 @@ makefiles = \
 
 ifeq ($(tests), yes)
 makefiles += \
-  src/libutil/tests/local.mk \
-  src/libstore/tests/local.mk \
-  src/libexpr/tests/local.mk \
-  tests/local.mk \
-  tests/ca/local.mk \
-  tests/dyn-drv/local.mk \
-  tests/test-libstoreconsumer/local.mk \
-  tests/plugins/local.mk
+  tests/unit/libutil/local.mk \
+  tests/unit/libutil-support/local.mk \
+  tests/unit/libstore/local.mk \
+  tests/unit/libstore-support/local.mk \
+  tests/unit/libexpr/local.mk \
+  tests/unit/libexpr-support/local.mk \
+  tests/functional/local.mk \
+  tests/functional/ca/local.mk \
+  tests/functional/dyn-drv/local.mk \
+  tests/functional/test-libstoreconsumer/local.mk \
+  tests/functional/plugins/local.mk
 else
 makefiles += \
   mk/disable-tests.mk
diff --git a/doc/internal-api/doxygen.cfg.in b/doc/internal-api/doxygen.cfg.in
index 8f526536d..a339662e3 100644
--- a/doc/internal-api/doxygen.cfg.in
+++ b/doc/internal-api/doxygen.cfg.in
@@ -39,17 +39,21 @@ INPUT                  = \
   src/libcmd \
   src/libexpr \
   src/libexpr/flake \
-  src/libexpr/tests \
-  src/libexpr/tests/value \
+  tests/unit/libexpr \
+  tests/unit/libexpr/value \
+  tests/unit/libexpr/test \
+  tests/unit/libexpr/test/value \
   src/libexpr/value \
   src/libfetchers \
   src/libmain \
   src/libstore \
   src/libstore/build \
   src/libstore/builtins \
-  src/libstore/tests \
+  tests/unit/libstore \
+  tests/unit/libstore/test \
   src/libutil \
-  src/libutil/tests \
+  tests/unit/libutil \
+  tests/unit/libutil/test \
   src/nix \
   src/nix-env \
   src/nix-store
diff --git a/doc/manual/src/contributing/testing.md b/doc/manual/src/contributing/testing.md
index cd94d5cfb..1b15d12b1 100644
--- a/doc/manual/src/contributing/testing.md
+++ b/doc/manual/src/contributing/testing.md
@@ -3,16 +3,28 @@
 ## Unit-tests
 
 The unit-tests for each Nix library (`libexpr`, `libstore`, etc..) are defined
-under `src/{library_name}/tests` using the
+under `tests/unit/{library_name}/tests` using the
 [googletest](https://google.github.io/googletest/) and
 [rapidcheck](https://github.com/emil-e/rapidcheck) frameworks.
 
 You can run the whole testsuite with `make check`, or the tests for a specific component with `make libfoo-tests_RUN`.
 Finer-grained filtering is also possible using the [--gtest_filter](https://google.github.io/googletest/advanced.html#running-a-subset-of-the-tests) command-line option, or the `GTEST_FILTER` environment variable.
 
+### Unit test support libraries
+
+There are headers and code which are not just used to test the library in question, but also downstream libraries.
+For example, we do [property testing] with the [rapidcheck] library.
+This requires writing `Arbitrary` "instances", which are used to describe how to generate values of a given type for the sake of running property tests.
+Because types contain other types, `Arbitrary` "instances" for some type are not just useful for testing that type, but also any other type that contains it.
+Downstream types frequently contain upstream types, so it is very important that we share arbitrary instances so that downstream libraries' property tests can also use them.
+
+It is important that these testing libraries don't contain any actual tests themselves.
+On some platforms they would be run as part of every test executable that uses them, which is redundant.
+On other platforms they wouldn't be run at all.
+
 ## Functional tests
 
-The functional tests reside under the `tests` directory and are listed in `tests/local.mk`.
+The functional tests reside under the `tests/functional` directory and are listed in `tests/functional/local.mk`.
 Each test is a bash script.
 
 ### Running the whole test suite
@@ -21,8 +33,8 @@ The whole test suite can be run with:
 
 ```shell-session
 $ make install && make installcheck
-ran test tests/foo.sh... [PASS]
-ran test tests/bar.sh... [PASS]
+ran test tests/functional/foo.sh... [PASS]
+ran test tests/functional/bar.sh... [PASS]
 ...
 ```
 
@@ -30,14 +42,14 @@ ran test tests/bar.sh... [PASS]
 
 Sometimes it is useful to group related tests so they can be easily run together without running the entire test suite.
 Each test group is in a subdirectory of `tests`.
-For example, `tests/ca/local.mk` defines a `ca` test group for content-addressed derivation outputs.
+For example, `tests/functional/ca/local.mk` defines a `ca` test group for content-addressed derivation outputs.
 
 That test group can be run like this:
 
 ```shell-session
 $ make ca.test-group -j50
-ran test tests/ca/nix-run.sh... [PASS]
-ran test tests/ca/import-derivation.sh... [PASS]
+ran test tests/functional/ca/nix-run.sh... [PASS]
+ran test tests/functional/ca/import-derivation.sh... [PASS]
 ...
 ```
 
@@ -56,21 +68,21 @@ install-tests-groups += $(test-group-name)
 Individual tests can be run with `make`:
 
 ```shell-session
-$ make tests/${testName}.sh.test
-ran test tests/${testName}.sh... [PASS]
+$ make tests/functional/${testName}.sh.test
+ran test tests/functional/${testName}.sh... [PASS]
 ```
 
 or without `make`:
 
 ```shell-session
-$ ./mk/run-test.sh tests/${testName}.sh
-ran test tests/${testName}.sh... [PASS]
+$ ./mk/run-test.sh tests/functional/${testName}.sh
+ran test tests/functional/${testName}.sh... [PASS]
 ```
 
 To see the complete output, one can also run:
 
 ```shell-session
-$ ./mk/debug-test.sh tests/${testName}.sh
+$ ./mk/debug-test.sh tests/functional/${testName}.sh
 + foo
 output from foo
 + bar
@@ -105,7 +117,7 @@ edit it like so:
 Then, running the test with `./mk/debug-test.sh` will drop you into GDB once the script reaches that point:
 
 ```shell-session
-$ ./mk/debug-test.sh tests/${testName}.sh
+$ ./mk/debug-test.sh tests/functional/${testName}.sh
 ...
 + gdb blash blub
 GNU gdb (GDB) 12.1
@@ -124,9 +136,11 @@ This technique is to include the exact output/behavior of a former version of Ni
 For example, this technique is used for the language tests, to check both the printed final value if evaluation was successful, and any errors and warnings encountered.
 
 It is frequently useful to regenerate the expected output.
-To do that, rerun the failed test with `_NIX_TEST_ACCEPT=1`.
-(At least, this is the convention we've used for `tests/lang.sh`.
-If we add more characterization testing we should always strive to be consistent.)
+To do that, rerun the failed test(s) with `_NIX_TEST_ACCEPT=1`.
+For example:
+```bash
+_NIX_TEST_ACCEPT=1 make tests/functional/lang.sh.test
+```
 
 An interesting situation to document is the case when these tests are "overfitted".
 The language tests are, again, an example of this.
diff --git a/flake.nix b/flake.nix
index 1d629bb6a..230bb6031 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
       linuxSystems = linux32BitSystems ++ linux64BitSystems;
       darwinSystems = [ "x86_64-darwin" "aarch64-darwin" ];
       systems = linuxSystems ++ darwinSystems;
-      
+
       crossSystems = [ "armv6l-linux" "armv7l-linux" ];
 
       stdenvs = [ "gccStdenv" "clangStdenv" "clang11Stdenv" "stdenv" "libcxxStdenv" "ccacheStdenv" ];
@@ -58,35 +58,28 @@
 
       nixSrc = fileset.toSource {
         root = ./.;
-        fileset = fileset.intersect baseFiles (
-          fileset.difference
-            (fileset.unions [
-              ./.version
-              ./boehmgc-coroutine-sp-fallback.diff
-              ./bootstrap.sh
-              ./configure.ac
-              ./doc
-              ./local.mk
-              ./m4
-              ./Makefile
-              ./Makefile.config.in
-              ./misc
-              ./mk
-              ./precompiled-headers.h
-              ./src
-              ./tests
-              ./COPYING
-              ./scripts/local.mk
-              (fileset.fileFilter (f: lib.strings.hasPrefix "nix-profile" f.name) ./scripts)
-              # TODO: do we really need README.md? It doesn't seem used in the build.
-              ./README.md
-            ])
-            (fileset.unions [
-              # Removed file sets
-              ./tests/nixos
-              ./tests/installer
-            ])
-        );
+        fileset = fileset.intersect baseFiles (fileset.unions [
+          ./.version
+          ./boehmgc-coroutine-sp-fallback.diff
+          ./bootstrap.sh
+          ./configure.ac
+          ./doc
+          ./local.mk
+          ./m4
+          ./Makefile
+          ./Makefile.config.in
+          ./misc
+          ./mk
+          ./precompiled-headers.h
+          ./src
+          ./tests/functional
+          ./tests/unit
+          ./COPYING
+          ./scripts/local.mk
+          (fileset.fileFilter (f: lib.strings.hasPrefix "nix-profile" f.name) ./scripts)
+          # TODO: do we really need README.md? It doesn't seem used in the build.
+          ./README.md
+        ]);
       };
 
       # Memoize nixpkgs for different platforms for efficiency.
diff --git a/mk/common-test.sh b/mk/common-test.sh
index 0a2e4c1c2..7ab25febf 100644
--- a/mk/common-test.sh
+++ b/mk/common-test.sh
@@ -1,11 +1,15 @@
+test_dir=tests/functional
+
+test=$(echo -n "$test" | sed -e "s|^$test_dir/||")
+
 TESTS_ENVIRONMENT=("TEST_NAME=${test%.*}" 'NIX_REMOTE=')
 
 : ${BASH:=/usr/bin/env bash}
 
 init_test () {
-   cd tests && env "${TESTS_ENVIRONMENT[@]}" $BASH -e init.sh 2>/dev/null > /dev/null
+   cd "$test_dir" && env "${TESTS_ENVIRONMENT[@]}" $BASH -e init.sh 2>/dev/null > /dev/null
 }
 
 run_test_proper () {
-   cd $(dirname $test) && env "${TESTS_ENVIRONMENT[@]}" $BASH -e $(basename $test)
+   cd "$test_dir/$(dirname $test)" && env "${TESTS_ENVIRONMENT[@]}" $BASH -e $(basename $test)
 }
diff --git a/src/libexpr/tests/local.mk b/src/libexpr/tests/local.mk
deleted file mode 100644
index c56848a14..000000000
--- a/src/libexpr/tests/local.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-check: libexpr-tests_RUN
-
-programs += libexpr-tests
-
-libexpr-tests_NAME := libnixexpr-tests
-
-libexpr-tests_DIR := $(d)
-
-libexpr-tests_INSTALL_DIR :=
-
-libexpr-tests_SOURCES := \
-    $(wildcard $(d)/*.cc) \
-    $(wildcard $(d)/value/*.cc)
-
-libexpr-tests_CXXFLAGS += -I src/libexpr -I src/libutil -I src/libstore -I src/libexpr/tests -I src/libfetchers
-
-libexpr-tests_LIBS = libstore-tests libutils-tests libexpr libutil libstore libfetchers
-
-libexpr-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS) -lgmock
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 26c87391c..516cbef83 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -776,7 +776,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
         }
     };
 
-    /* Synchronisation point for testing, see tests/gc-concurrent.sh. */
+    /* Synchronisation point for testing, see tests/functional/gc-concurrent.sh. */
     if (auto p = getEnv("_NIX_TEST_GC_SYNC"))
         readFile(*p);
 
diff --git a/src/libstore/tests/local.mk b/src/libstore/tests/local.mk
deleted file mode 100644
index 03becc7d1..000000000
--- a/src/libstore/tests/local.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-check: libstore-tests-exe_RUN
-
-programs += libstore-tests-exe
-
-libstore-tests-exe_NAME = libnixstore-tests
-
-libstore-tests-exe_DIR := $(d)
-
-libstore-tests-exe_INSTALL_DIR :=
-
-libstore-tests-exe_LIBS = libstore-tests
-
-libstore-tests-exe_LDFLAGS := $(GTEST_LIBS)
-
-libraries += libstore-tests
-
-libstore-tests_NAME = libnixstore-tests
-
-libstore-tests_DIR := $(d)
-
-libstore-tests_INSTALL_DIR :=
-
-libstore-tests_SOURCES := $(wildcard $(d)/*.cc)
-
-libstore-tests_CXXFLAGS += -I src/libstore -I src/libutil
-
-libstore-tests_LIBS = libutil-tests libstore libutil
-
-libstore-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS)
diff --git a/src/libutil/tests/local.mk b/src/libutil/tests/local.mk
deleted file mode 100644
index 167915439..000000000
--- a/src/libutil/tests/local.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-check: libutil-tests_RUN
-
-programs += libutil-tests
-
-libutil-tests-exe_NAME = libnixutil-tests
-
-libutil-tests-exe_DIR := $(d)
-
-libutil-tests-exe_INSTALL_DIR :=
-
-libutil-tests-exe_LIBS = libutil-tests
-
-libutil-tests-exe_LDFLAGS := $(GTEST_LIBS)
-
-libraries += libutil-tests
-
-libutil-tests_NAME = libnixutil-tests
-
-libutil-tests_DIR := $(d)
-
-libutil-tests_INSTALL_DIR :=
-
-libutil-tests_SOURCES := $(wildcard $(d)/*.cc)
-
-libutil-tests_CXXFLAGS += -I src/libutil
-
-libutil-tests_LIBS = libutil
-
-libutil-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS)
diff --git a/src/libutil/url-parts.hh b/src/libutil/url-parts.hh
index 98162b0f7..12026921f 100644
--- a/src/libutil/url-parts.hh
+++ b/src/libutil/url-parts.hh
@@ -30,7 +30,7 @@ extern std::regex refRegex;
 
 /// Instead of defining what a good Git Ref is, we define what a bad Git Ref is
 /// This is because of the definition of a ref in refs.c in https://github.com/git/git
-/// See tests/fetchGitRefs.sh for the full definition
+/// See tests/functional/fetchGitRefs.sh for the full definition
 const static std::string badGitRefRegexS = "//|^[./]|/\\.|\\.\\.|[[:cntrl:][:space:]:?^~\[]|\\\\|\\*|\\.lock$|\\.lock/|@\\{|[/.]$|^@$|^$";
 extern std::regex badGitRefRegex;
 
diff --git a/tests/add.sh b/tests/functional/add.sh
index 5c3eed793..5c3eed793 100644
--- a/tests/add.sh
+++ b/tests/functional/add.sh
diff --git a/tests/bad.tar.xz b/tests/functional/bad.tar.xz
index 250a5ad1a..250a5ad1a 100644
--- a/tests/bad.tar.xz
+++ b/tests/functional/bad.tar.xz
diff --git a/tests/bash-profile.sh b/tests/functional/bash-profile.sh
index e2e0d1090..3faeaaba1 100644
--- a/tests/bash-profile.sh
+++ b/tests/functional/bash-profile.sh
@@ -1,6 +1,6 @@
 source common.sh
 
-sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" -e "s|@coreutils@|$coreutils|g" < ../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh
+sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" -e "s|@coreutils@|$coreutils|g" < ../../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh
 
 user=$(whoami)
 rm -rf $TEST_HOME $TEST_ROOT/profile-var
diff --git a/tests/big-derivation-attr.nix b/tests/functional/big-derivation-attr.nix
index 35c1187f6..35c1187f6 100644
--- a/tests/big-derivation-attr.nix
+++ b/tests/functional/big-derivation-attr.nix
diff --git a/tests/binary-cache-build-remote.sh b/tests/functional/binary-cache-build-remote.sh
index 81cd21a4a..81cd21a4a 100644
--- a/tests/binary-cache-build-remote.sh
+++ b/tests/functional/binary-cache-build-remote.sh
diff --git a/tests/binary-cache.sh b/tests/functional/binary-cache.sh
index 7c64a115c..7c64a115c 100644
--- a/tests/binary-cache.sh
+++ b/tests/functional/binary-cache.sh
diff --git a/tests/brotli.sh b/tests/functional/brotli.sh
index dc9bbdb66..dc9bbdb66 100644
--- a/tests/brotli.sh
+++ b/tests/functional/brotli.sh
diff --git a/tests/build-delete.sh b/tests/functional/build-delete.sh
index 9c56b00e8..9c56b00e8 100644
--- a/tests/build-delete.sh
+++ b/tests/functional/build-delete.sh
diff --git a/tests/build-dry.sh b/tests/functional/build-dry.sh
index 6d1754af5..6d1754af5 100644
--- a/tests/build-dry.sh
+++ b/tests/functional/build-dry.sh
diff --git a/tests/build-hook-ca-fixed.nix b/tests/functional/build-hook-ca-fixed.nix
index 4cb9e85d1..4cb9e85d1 100644
--- a/tests/build-hook-ca-fixed.nix
+++ b/tests/functional/build-hook-ca-fixed.nix
diff --git a/tests/build-hook-ca-floating.nix b/tests/functional/build-hook-ca-floating.nix
index dfdbb82da..dfdbb82da 100644
--- a/tests/build-hook-ca-floating.nix
+++ b/tests/functional/build-hook-ca-floating.nix
diff --git a/tests/build-hook.nix b/tests/functional/build-hook.nix
index 7effd7903..7effd7903 100644
--- a/tests/build-hook.nix
+++ b/tests/functional/build-hook.nix
diff --git a/tests/build-remote-content-addressed-fixed.sh b/tests/functional/build-remote-content-addressed-fixed.sh
index ae7441591..ae7441591 100644
--- a/tests/build-remote-content-addressed-fixed.sh
+++ b/tests/functional/build-remote-content-addressed-fixed.sh
diff --git a/tests/build-remote-content-addressed-floating.sh b/tests/functional/build-remote-content-addressed-floating.sh
index e83b42b41..e83b42b41 100644
--- a/tests/build-remote-content-addressed-floating.sh
+++ b/tests/functional/build-remote-content-addressed-floating.sh
diff --git a/tests/build-remote-input-addressed.sh b/tests/functional/build-remote-input-addressed.sh
index 49d15c389..49d15c389 100644
--- a/tests/build-remote-input-addressed.sh
+++ b/tests/functional/build-remote-input-addressed.sh
diff --git a/tests/build-remote-trustless-after.sh b/tests/functional/build-remote-trustless-after.sh
index 19f59e6ae..19f59e6ae 100644
--- a/tests/build-remote-trustless-after.sh
+++ b/tests/functional/build-remote-trustless-after.sh
diff --git a/tests/build-remote-trustless-should-fail-0.sh b/tests/functional/build-remote-trustless-should-fail-0.sh
index fad1def59..fad1def59 100644
--- a/tests/build-remote-trustless-should-fail-0.sh
+++ b/tests/functional/build-remote-trustless-should-fail-0.sh
diff --git a/tests/build-remote-trustless-should-pass-0.sh b/tests/functional/build-remote-trustless-should-pass-0.sh
index 2a7ebd8c6..2a7ebd8c6 100644
--- a/tests/build-remote-trustless-should-pass-0.sh
+++ b/tests/functional/build-remote-trustless-should-pass-0.sh
diff --git a/tests/build-remote-trustless-should-pass-1.sh b/tests/functional/build-remote-trustless-should-pass-1.sh
index 516bdf092..516bdf092 100644
--- a/tests/build-remote-trustless-should-pass-1.sh
+++ b/tests/functional/build-remote-trustless-should-pass-1.sh
diff --git a/tests/build-remote-trustless-should-pass-2.sh b/tests/functional/build-remote-trustless-should-pass-2.sh
index b769a88f0..b769a88f0 100644
--- a/tests/build-remote-trustless-should-pass-2.sh
+++ b/tests/functional/build-remote-trustless-should-pass-2.sh
diff --git a/tests/build-remote-trustless-should-pass-3.sh b/tests/functional/build-remote-trustless-should-pass-3.sh
index 40f81da5a..40f81da5a 100644
--- a/tests/build-remote-trustless-should-pass-3.sh
+++ b/tests/functional/build-remote-trustless-should-pass-3.sh
diff --git a/tests/build-remote-trustless.sh b/tests/functional/build-remote-trustless.sh
index 9df44e0c5..81e5253bf 100644
--- a/tests/build-remote-trustless.sh
+++ b/tests/functional/build-remote-trustless.sh
@@ -6,7 +6,7 @@ unset NIX_STATE_DIR
 
 remoteDir=$TEST_ROOT/remote
 
-# Note: ssh{-ng}://localhost bypasses ssh. See tests/build-remote.sh for
+# Note: ssh{-ng}://localhost bypasses ssh. See tests/functional/build-remote.sh for
 # more details.
 nix-build $file -o $TEST_ROOT/result --max-jobs 0 \
   --arg busybox $busybox \
diff --git a/tests/build-remote.sh b/tests/functional/build-remote.sh
index d2a2132c1..d2a2132c1 100644
--- a/tests/build-remote.sh
+++ b/tests/functional/build-remote.sh
diff --git a/tests/build.sh b/tests/functional/build.sh
index 7fbdb0f07..7fbdb0f07 100644
--- a/tests/build.sh
+++ b/tests/functional/build.sh
diff --git a/tests/ca-shell.nix b/tests/functional/ca-shell.nix
index 36e1d1526..36e1d1526 100644
--- a/tests/ca-shell.nix
+++ b/tests/functional/ca-shell.nix
diff --git a/tests/ca/build-cache.sh b/tests/functional/ca/build-cache.sh
index 6a4080fec..6a4080fec 100644
--- a/tests/ca/build-cache.sh
+++ b/tests/functional/ca/build-cache.sh
diff --git a/tests/ca/build-dry.sh b/tests/functional/ca/build-dry.sh
index 9a72075ec..9a72075ec 100644
--- a/tests/ca/build-dry.sh
+++ b/tests/functional/ca/build-dry.sh
diff --git a/tests/ca/build-with-garbage-path.sh b/tests/functional/ca/build-with-garbage-path.sh
index 884cd2802..884cd2802 100755
--- a/tests/ca/build-with-garbage-path.sh
+++ b/tests/functional/ca/build-with-garbage-path.sh
diff --git a/tests/ca/build.sh b/tests/functional/ca/build.sh
index e1a8a7625..e1a8a7625 100644
--- a/tests/ca/build.sh
+++ b/tests/functional/ca/build.sh
diff --git a/tests/ca/common.sh b/tests/functional/ca/common.sh
index b104b5a78..b104b5a78 100644
--- a/tests/ca/common.sh
+++ b/tests/functional/ca/common.sh
diff --git a/tests/ca/concurrent-builds.sh b/tests/functional/ca/concurrent-builds.sh
index b442619e2..b442619e2 100755
--- a/tests/ca/concurrent-builds.sh
+++ b/tests/functional/ca/concurrent-builds.sh
diff --git a/tests/ca/config.nix.in b/tests/functional/ca/config.nix.in
index af24ddb30..af24ddb30 120000
--- a/tests/ca/config.nix.in
+++ b/tests/functional/ca/config.nix.in
diff --git a/tests/ca/content-addressed.nix b/tests/functional/ca/content-addressed.nix
index 2559c562f..2559c562f 100644
--- a/tests/ca/content-addressed.nix
+++ b/tests/functional/ca/content-addressed.nix
diff --git a/tests/ca/derivation-json.sh b/tests/functional/ca/derivation-json.sh
index c1480fd17..c1480fd17 100644
--- a/tests/ca/derivation-json.sh
+++ b/tests/functional/ca/derivation-json.sh
diff --git a/tests/ca/duplicate-realisation-in-closure.sh b/tests/functional/ca/duplicate-realisation-in-closure.sh
index da9cd8fb4..da9cd8fb4 100644
--- a/tests/ca/duplicate-realisation-in-closure.sh
+++ b/tests/functional/ca/duplicate-realisation-in-closure.sh
diff --git a/tests/ca/flake.nix b/tests/functional/ca/flake.nix
index 332c92a67..332c92a67 100644
--- a/tests/ca/flake.nix
+++ b/tests/functional/ca/flake.nix
diff --git a/tests/ca/gc.sh b/tests/functional/ca/gc.sh
index e9b6c5ab5..e9b6c5ab5 100755
--- a/tests/ca/gc.sh
+++ b/tests/functional/ca/gc.sh
diff --git a/tests/ca/import-derivation.sh b/tests/functional/ca/import-derivation.sh
index e98e0fbd0..e98e0fbd0 100644
--- a/tests/ca/import-derivation.sh
+++ b/tests/functional/ca/import-derivation.sh
diff --git a/tests/ca/local.mk b/tests/functional/ca/local.mk
index 0852e592e..fd87b8d1f 100644
--- a/tests/ca/local.mk
+++ b/tests/functional/ca/local.mk
@@ -25,4 +25,4 @@ clean-files += \
   $(d)/config.nix
 
 test-deps += \
-  tests/ca/config.nix
+  tests/functional/ca/config.nix
diff --git a/tests/ca/new-build-cmd.sh b/tests/functional/ca/new-build-cmd.sh
index 432d4d132..432d4d132 100644
--- a/tests/ca/new-build-cmd.sh
+++ b/tests/functional/ca/new-build-cmd.sh
diff --git a/tests/ca/nix-copy.sh b/tests/functional/ca/nix-copy.sh
index 7a8307a4e..7a8307a4e 100755
--- a/tests/ca/nix-copy.sh
+++ b/tests/functional/ca/nix-copy.sh
diff --git a/tests/ca/nix-run.sh b/tests/functional/ca/nix-run.sh
index 5f46518e8..5f46518e8 100755
--- a/tests/ca/nix-run.sh
+++ b/tests/functional/ca/nix-run.sh
diff --git a/tests/ca/nix-shell.sh b/tests/functional/ca/nix-shell.sh
index 1c5a6639f..1c5a6639f 100755
--- a/tests/ca/nix-shell.sh
+++ b/tests/functional/ca/nix-shell.sh
diff --git a/tests/ca/nondeterministic.nix b/tests/functional/ca/nondeterministic.nix
index d6d099a3e..d6d099a3e 100644
--- a/tests/ca/nondeterministic.nix
+++ b/tests/functional/ca/nondeterministic.nix
diff --git a/tests/ca/post-hook.sh b/tests/functional/ca/post-hook.sh
index 705bde9d4..705bde9d4 100755
--- a/tests/ca/post-hook.sh
+++ b/tests/functional/ca/post-hook.sh
diff --git a/tests/ca/racy.nix b/tests/functional/ca/racy.nix
index 555a15484..555a15484 100644
--- a/tests/ca/racy.nix
+++ b/tests/functional/ca/racy.nix
diff --git a/tests/ca/recursive.sh b/tests/functional/ca/recursive.sh
index cd6736b24..cd6736b24 100755
--- a/tests/ca/recursive.sh
+++ b/tests/functional/ca/recursive.sh
diff --git a/tests/ca/repl.sh b/tests/functional/ca/repl.sh
index 3808c7cb2..3808c7cb2 100644
--- a/tests/ca/repl.sh
+++ b/tests/functional/ca/repl.sh
diff --git a/tests/ca/selfref-gc.sh b/tests/functional/ca/selfref-gc.sh
index 248778894..248778894 100755
--- a/tests/ca/selfref-gc.sh
+++ b/tests/functional/ca/selfref-gc.sh
diff --git a/tests/ca/signatures.sh b/tests/functional/ca/signatures.sh
index eb18a4130..eb18a4130 100644
--- a/tests/ca/signatures.sh
+++ b/tests/functional/ca/signatures.sh
diff --git a/tests/ca/substitute.sh b/tests/functional/ca/substitute.sh
index ea981adc4..ea981adc4 100644
--- a/tests/ca/substitute.sh
+++ b/tests/functional/ca/substitute.sh
diff --git a/tests/ca/why-depends.sh b/tests/functional/ca/why-depends.sh
index 0c079f63b..0c079f63b 100644
--- a/tests/ca/why-depends.sh
+++ b/tests/functional/ca/why-depends.sh
diff --git a/tests/case-hack.sh b/tests/functional/case-hack.sh
index 61bf9b94b..61bf9b94b 100644
--- a/tests/case-hack.sh
+++ b/tests/functional/case-hack.sh
diff --git a/tests/case.nar b/tests/functional/case.nar
index 22ff26db5..22ff26db5 100644
--- a/tests/case.nar
+++ b/tests/functional/case.nar
diff --git a/tests/check-refs.nix b/tests/functional/check-refs.nix
index 89690e456..89690e456 100644
--- a/tests/check-refs.nix
+++ b/tests/functional/check-refs.nix
diff --git a/tests/check-refs.sh b/tests/functional/check-refs.sh
index 3b587d1e5..3b587d1e5 100644
--- a/tests/check-refs.sh
+++ b/tests/functional/check-refs.sh
diff --git a/tests/check-reqs.nix b/tests/functional/check-reqs.nix
index 41436cb48..41436cb48 100644
--- a/tests/check-reqs.nix
+++ b/tests/functional/check-reqs.nix
diff --git a/tests/check-reqs.sh b/tests/functional/check-reqs.sh
index 856c94cec..856c94cec 100644
--- a/tests/check-reqs.sh
+++ b/tests/functional/check-reqs.sh
diff --git a/tests/check.nix b/tests/functional/check.nix
index ddab8eea9..ddab8eea9 100644
--- a/tests/check.nix
+++ b/tests/functional/check.nix
diff --git a/tests/check.sh b/tests/functional/check.sh
index e13abf747..e13abf747 100644
--- a/tests/check.sh
+++ b/tests/functional/check.sh
diff --git a/tests/common.sh b/tests/functional/common.sh
index 7b0922c9f..7b0922c9f 100644
--- a/tests/common.sh
+++ b/tests/functional/common.sh
diff --git a/tests/common/vars-and-functions.sh.in b/tests/functional/common/vars-and-functions.sh.in
index 8f9ec4b1a..967d6be54 100644
--- a/tests/common/vars-and-functions.sh.in
+++ b/tests/functional/common/vars-and-functions.sh.in
@@ -6,7 +6,7 @@ COMMON_VARS_AND_FUNCTIONS_SH_SOURCED=1
 
 export PS4='+(${BASH_SOURCE[0]-$0}:$LINENO) '
 
-export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test)/${TEST_NAME:-default}
+export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test)/${TEST_NAME:-default/tests\/functional//}
 export NIX_STORE_DIR
 if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then
     # Maybe the build directory is symlinked.
diff --git a/tests/completions.sh b/tests/functional/completions.sh
index 19dc61098..19dc61098 100644
--- a/tests/completions.sh
+++ b/tests/functional/completions.sh
diff --git a/tests/compression-levels.sh b/tests/functional/compression-levels.sh
index 85f12974a..85f12974a 100644
--- a/tests/compression-levels.sh
+++ b/tests/functional/compression-levels.sh
diff --git a/tests/compute-levels.sh b/tests/functional/compute-levels.sh
index de3da2ebd..de3da2ebd 100644
--- a/tests/compute-levels.sh
+++ b/tests/functional/compute-levels.sh
diff --git a/tests/config.nix.in b/tests/functional/config.nix.in
index 7facbdcbc..7facbdcbc 100644
--- a/tests/config.nix.in
+++ b/tests/functional/config.nix.in
diff --git a/tests/config.sh b/tests/functional/config.sh
index 723f575ed..723f575ed 100644
--- a/tests/config.sh
+++ b/tests/functional/config.sh
diff --git a/tests/config/nix-with-substituters.conf b/tests/functional/config/nix-with-substituters.conf
index 90f359a6f..90f359a6f 100644
--- a/tests/config/nix-with-substituters.conf
+++ b/tests/functional/config/nix-with-substituters.conf
diff --git a/tests/db-migration.sh b/tests/functional/db-migration.sh
index 44cd16bc0..44cd16bc0 100644
--- a/tests/db-migration.sh
+++ b/tests/functional/db-migration.sh
diff --git a/tests/dependencies.builder0.sh b/tests/functional/dependencies.builder0.sh
index 9b11576e0..9b11576e0 100644
--- a/tests/dependencies.builder0.sh
+++ b/tests/functional/dependencies.builder0.sh
diff --git a/tests/dependencies.nix b/tests/functional/dependencies.nix
index be1a7ae9a..be1a7ae9a 100644
--- a/tests/dependencies.nix
+++ b/tests/functional/dependencies.nix
diff --git a/tests/dependencies.sh b/tests/functional/dependencies.sh
index b93dacac0..b93dacac0 100644
--- a/tests/dependencies.sh
+++ b/tests/functional/dependencies.sh
diff --git a/tests/derivation-json.sh b/tests/functional/derivation-json.sh
index b6be5d977..b6be5d977 100644
--- a/tests/derivation-json.sh
+++ b/tests/functional/derivation-json.sh
diff --git a/tests/dummy b/tests/functional/dummy
index 557db03de..557db03de 100644
--- a/tests/dummy
+++ b/tests/functional/dummy
diff --git a/tests/dump-db.sh b/tests/functional/dump-db.sh
index 48647f403..48647f403 100644
--- a/tests/dump-db.sh
+++ b/tests/functional/dump-db.sh
diff --git a/tests/dyn-drv/build-built-drv.sh b/tests/functional/dyn-drv/build-built-drv.sh
index 647be9457..647be9457 100644
--- a/tests/dyn-drv/build-built-drv.sh
+++ b/tests/functional/dyn-drv/build-built-drv.sh
diff --git a/tests/dyn-drv/common.sh b/tests/functional/dyn-drv/common.sh
index c786f6925..c786f6925 100644
--- a/tests/dyn-drv/common.sh
+++ b/tests/functional/dyn-drv/common.sh
diff --git a/tests/dyn-drv/config.nix.in b/tests/functional/dyn-drv/config.nix.in
index af24ddb30..af24ddb30 120000
--- a/tests/dyn-drv/config.nix.in
+++ b/tests/functional/dyn-drv/config.nix.in
diff --git a/tests/dyn-drv/dep-built-drv.sh b/tests/functional/dyn-drv/dep-built-drv.sh
index 4f6e9b080..4f6e9b080 100644
--- a/tests/dyn-drv/dep-built-drv.sh
+++ b/tests/functional/dyn-drv/dep-built-drv.sh
diff --git a/tests/dyn-drv/eval-outputOf.sh b/tests/functional/dyn-drv/eval-outputOf.sh
index 9467feb8d..9467feb8d 100644
--- a/tests/dyn-drv/eval-outputOf.sh
+++ b/tests/functional/dyn-drv/eval-outputOf.sh
diff --git a/tests/dyn-drv/local.mk b/tests/functional/dyn-drv/local.mk
index 6b435499b..c87534944 100644
--- a/tests/dyn-drv/local.mk
+++ b/tests/functional/dyn-drv/local.mk
@@ -12,4 +12,4 @@ clean-files += \
   $(d)/config.nix
 
 test-deps += \
-  tests/dyn-drv/config.nix
+  tests/functional/dyn-drv/config.nix
diff --git a/tests/dyn-drv/old-daemon-error-hack.nix b/tests/functional/dyn-drv/old-daemon-error-hack.nix
index c9d4a62d4..c9d4a62d4 100644
--- a/tests/dyn-drv/old-daemon-error-hack.nix
+++ b/tests/functional/dyn-drv/old-daemon-error-hack.nix
diff --git a/tests/dyn-drv/old-daemon-error-hack.sh b/tests/functional/dyn-drv/old-daemon-error-hack.sh
index 43b049973..43b049973 100644
--- a/tests/dyn-drv/old-daemon-error-hack.sh
+++ b/tests/functional/dyn-drv/old-daemon-error-hack.sh
diff --git a/tests/dyn-drv/recursive-mod-json.nix b/tests/functional/dyn-drv/recursive-mod-json.nix
index c6a24ca4f..c6a24ca4f 100644
--- a/tests/dyn-drv/recursive-mod-json.nix
+++ b/tests/functional/dyn-drv/recursive-mod-json.nix
diff --git a/tests/dyn-drv/recursive-mod-json.sh b/tests/functional/dyn-drv/recursive-mod-json.sh
index 0698b81bd..0698b81bd 100644
--- a/tests/dyn-drv/recursive-mod-json.sh
+++ b/tests/functional/dyn-drv/recursive-mod-json.sh
diff --git a/tests/dyn-drv/text-hashed-output.nix b/tests/functional/dyn-drv/text-hashed-output.nix
index 99203b518..99203b518 100644
--- a/tests/dyn-drv/text-hashed-output.nix
+++ b/tests/functional/dyn-drv/text-hashed-output.nix
diff --git a/tests/dyn-drv/text-hashed-output.sh b/tests/functional/dyn-drv/text-hashed-output.sh
index f3e5aa93b..f3e5aa93b 100644
--- a/tests/dyn-drv/text-hashed-output.sh
+++ b/tests/functional/dyn-drv/text-hashed-output.sh
diff --git a/tests/eval-store.sh b/tests/functional/eval-store.sh
index 8fc859730..8fc859730 100644
--- a/tests/eval-store.sh
+++ b/tests/functional/eval-store.sh
diff --git a/tests/eval.nix b/tests/functional/eval.nix
index befbd17a9..befbd17a9 100644
--- a/tests/eval.nix
+++ b/tests/functional/eval.nix
diff --git a/tests/eval.sh b/tests/functional/eval.sh
index b81bb1e2c..b81bb1e2c 100644
--- a/tests/eval.sh
+++ b/tests/functional/eval.sh
diff --git a/tests/experimental-features.sh b/tests/functional/experimental-features.sh
index 607bf0a8e..607bf0a8e 100644
--- a/tests/experimental-features.sh
+++ b/tests/functional/experimental-features.sh
diff --git a/tests/export-graph.nix b/tests/functional/export-graph.nix
index 64fe36bd1..64fe36bd1 100644
--- a/tests/export-graph.nix
+++ b/tests/functional/export-graph.nix
diff --git a/tests/export-graph.sh b/tests/functional/export-graph.sh
index 1f6232a40..1f6232a40 100644
--- a/tests/export-graph.sh
+++ b/tests/functional/export-graph.sh
diff --git a/tests/export.sh b/tests/functional/export.sh
index 2238539bc..2238539bc 100644
--- a/tests/export.sh
+++ b/tests/functional/export.sh
diff --git a/tests/failing.nix b/tests/functional/failing.nix
index 2a0350d4d..2a0350d4d 100644
--- a/tests/failing.nix
+++ b/tests/functional/failing.nix
diff --git a/tests/fetchClosure.sh b/tests/functional/fetchClosure.sh
index a02d1ce7a..a02d1ce7a 100644
--- a/tests/fetchClosure.sh
+++ b/tests/functional/fetchClosure.sh
diff --git a/tests/fetchGit.sh b/tests/functional/fetchGit.sh
index 418b4f63f..418b4f63f 100644
--- a/tests/fetchGit.sh
+++ b/tests/functional/fetchGit.sh
diff --git a/tests/fetchGitRefs.sh b/tests/functional/fetchGitRefs.sh
index d643fea04..d643fea04 100644
--- a/tests/fetchGitRefs.sh
+++ b/tests/functional/fetchGitRefs.sh
diff --git a/tests/fetchGitSubmodules.sh b/tests/functional/fetchGitSubmodules.sh
index df81232e5..df81232e5 100644
--- a/tests/fetchGitSubmodules.sh
+++ b/tests/functional/fetchGitSubmodules.sh
diff --git a/tests/fetchMercurial.sh b/tests/functional/fetchMercurial.sh
index e6f8525c6..e6f8525c6 100644
--- a/tests/fetchMercurial.sh
+++ b/tests/functional/fetchMercurial.sh
diff --git a/tests/fetchPath.sh b/tests/functional/fetchPath.sh
index 29be38ce2..29be38ce2 100644
--- a/tests/fetchPath.sh
+++ b/tests/functional/fetchPath.sh
diff --git a/tests/fetchTree-file.sh b/tests/functional/fetchTree-file.sh
index 6395c133d..6395c133d 100644
--- a/tests/fetchTree-file.sh
+++ b/tests/functional/fetchTree-file.sh
diff --git a/tests/fetchurl.sh b/tests/functional/fetchurl.sh
index 8cd40c09f..8cd40c09f 100644
--- a/tests/fetchurl.sh
+++ b/tests/functional/fetchurl.sh
diff --git a/tests/filter-source.nix b/tests/functional/filter-source.nix
index 907163639..907163639 100644
--- a/tests/filter-source.nix
+++ b/tests/functional/filter-source.nix
diff --git a/tests/filter-source.sh b/tests/functional/filter-source.sh
index ba34d2eac..ba34d2eac 100644
--- a/tests/filter-source.sh
+++ b/tests/functional/filter-source.sh
diff --git a/tests/fixed.builder1.sh b/tests/functional/fixed.builder1.sh
index c41bb2b9a..c41bb2b9a 100644
--- a/tests/fixed.builder1.sh
+++ b/tests/functional/fixed.builder1.sh
diff --git a/tests/fixed.builder2.sh b/tests/functional/fixed.builder2.sh
index 31ea1579a..31ea1579a 100644
--- a/tests/fixed.builder2.sh
+++ b/tests/functional/fixed.builder2.sh
diff --git a/tests/fixed.nix b/tests/functional/fixed.nix
index babe71504..babe71504 100644
--- a/tests/fixed.nix
+++ b/tests/functional/fixed.nix
diff --git a/tests/fixed.sh b/tests/functional/fixed.sh
index f1e1ce420..f1e1ce420 100644
--- a/tests/fixed.sh
+++ b/tests/functional/fixed.sh
diff --git a/tests/flakes/absolute-paths.sh b/tests/functional/flakes/absolute-paths.sh
index e7bfba12d..e7bfba12d 100644
--- a/tests/flakes/absolute-paths.sh
+++ b/tests/functional/flakes/absolute-paths.sh
diff --git a/tests/flakes/build-paths.sh b/tests/functional/flakes/build-paths.sh
index ff012e1b3..ff012e1b3 100644
--- a/tests/flakes/build-paths.sh
+++ b/tests/functional/flakes/build-paths.sh
diff --git a/tests/flakes/bundle.sh b/tests/functional/flakes/bundle.sh
index 67bbb05ac..67bbb05ac 100644
--- a/tests/flakes/bundle.sh
+++ b/tests/functional/flakes/bundle.sh
diff --git a/tests/flakes/check.sh b/tests/functional/flakes/check.sh
index 0433e5335..0433e5335 100644
--- a/tests/flakes/check.sh
+++ b/tests/functional/flakes/check.sh
diff --git a/tests/flakes/circular.sh b/tests/functional/flakes/circular.sh
index 09cd02edf..09cd02edf 100644
--- a/tests/flakes/circular.sh
+++ b/tests/functional/flakes/circular.sh
diff --git a/tests/flakes/common.sh b/tests/functional/flakes/common.sh
index 427abcdde..427abcdde 100644
--- a/tests/flakes/common.sh
+++ b/tests/functional/flakes/common.sh
diff --git a/tests/flakes/config.sh b/tests/functional/flakes/config.sh
index d1941a6be..d1941a6be 100644
--- a/tests/flakes/config.sh
+++ b/tests/functional/flakes/config.sh
diff --git a/tests/flakes/flake-in-submodule.sh b/tests/functional/flakes/flake-in-submodule.sh
index 21a4b52de..21a4b52de 100644
--- a/tests/flakes/flake-in-submodule.sh
+++ b/tests/functional/flakes/flake-in-submodule.sh
diff --git a/tests/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
index 128f759ea..128f759ea 100644
--- a/tests/flakes/flakes.sh
+++ b/tests/functional/flakes/flakes.sh
diff --git a/tests/flakes/follow-paths.sh b/tests/functional/flakes/follow-paths.sh
index dc97027ac..dc97027ac 100644
--- a/tests/flakes/follow-paths.sh
+++ b/tests/functional/flakes/follow-paths.sh
diff --git a/tests/flakes/init.sh b/tests/functional/flakes/init.sh
index 2d4c77ba1..2d4c77ba1 100644
--- a/tests/flakes/init.sh
+++ b/tests/functional/flakes/init.sh
diff --git a/tests/flakes/inputs.sh b/tests/functional/flakes/inputs.sh
index 80620488a..80620488a 100644
--- a/tests/flakes/inputs.sh
+++ b/tests/functional/flakes/inputs.sh
diff --git a/tests/flakes/mercurial.sh b/tests/functional/flakes/mercurial.sh
index 0622c79b7..0622c79b7 100644
--- a/tests/flakes/mercurial.sh
+++ b/tests/functional/flakes/mercurial.sh
diff --git a/tests/flakes/run.sh b/tests/functional/flakes/run.sh
index 9fa51d1c7..9fa51d1c7 100644
--- a/tests/flakes/run.sh
+++ b/tests/functional/flakes/run.sh
diff --git a/tests/flakes/search-root.sh b/tests/functional/flakes/search-root.sh
index d8586dc8a..d8586dc8a 100644
--- a/tests/flakes/search-root.sh
+++ b/tests/functional/flakes/search-root.sh
diff --git a/tests/flakes/show.sh b/tests/functional/flakes/show.sh
index a3d300552..a3d300552 100644
--- a/tests/flakes/show.sh
+++ b/tests/functional/flakes/show.sh
diff --git a/tests/flakes/unlocked-override.sh b/tests/functional/flakes/unlocked-override.sh
index 8abc8b7d3..8abc8b7d3 100644
--- a/tests/flakes/unlocked-override.sh
+++ b/tests/functional/flakes/unlocked-override.sh
diff --git a/tests/fmt.sh b/tests/functional/fmt.sh
index 3c1bd9989..3c1bd9989 100644
--- a/tests/fmt.sh
+++ b/tests/functional/fmt.sh
diff --git a/tests/fmt.simple.sh b/tests/functional/fmt.simple.sh
index 4c8c67ebb..4c8c67ebb 100755
--- a/tests/fmt.simple.sh
+++ b/tests/functional/fmt.simple.sh
diff --git a/tests/function-trace.sh b/tests/functional/function-trace.sh
index bd804bf18..bd804bf18 100755
--- a/tests/function-trace.sh
+++ b/tests/functional/function-trace.sh
diff --git a/tests/gc-auto.sh b/tests/functional/gc-auto.sh
index 521d9e539..521d9e539 100644
--- a/tests/gc-auto.sh
+++ b/tests/functional/gc-auto.sh
diff --git a/tests/gc-concurrent.builder.sh b/tests/functional/gc-concurrent.builder.sh
index bb6dcd4cf..bb6dcd4cf 100644
--- a/tests/gc-concurrent.builder.sh
+++ b/tests/functional/gc-concurrent.builder.sh
diff --git a/tests/gc-concurrent.nix b/tests/functional/gc-concurrent.nix
index 0aba1f983..0aba1f983 100644
--- a/tests/gc-concurrent.nix
+++ b/tests/functional/gc-concurrent.nix
diff --git a/tests/gc-concurrent.sh b/tests/functional/gc-concurrent.sh
index 2c6622c62..2c6622c62 100644
--- a/tests/gc-concurrent.sh
+++ b/tests/functional/gc-concurrent.sh
diff --git a/tests/gc-concurrent2.builder.sh b/tests/functional/gc-concurrent2.builder.sh
index 4f6c58b96..4f6c58b96 100644
--- a/tests/gc-concurrent2.builder.sh
+++ b/tests/functional/gc-concurrent2.builder.sh
diff --git a/tests/gc-non-blocking.sh b/tests/functional/gc-non-blocking.sh
index 0d781485d..0d781485d 100644
--- a/tests/gc-non-blocking.sh
+++ b/tests/functional/gc-non-blocking.sh
diff --git a/tests/gc-runtime.nix b/tests/functional/gc-runtime.nix
index ee5980bdf..ee5980bdf 100644
--- a/tests/gc-runtime.nix
+++ b/tests/functional/gc-runtime.nix
diff --git a/tests/gc-runtime.sh b/tests/functional/gc-runtime.sh
index dc1826a55..dc1826a55 100644
--- a/tests/gc-runtime.sh
+++ b/tests/functional/gc-runtime.sh
diff --git a/tests/gc.sh b/tests/functional/gc.sh
index ad09a8b39..ad09a8b39 100644
--- a/tests/gc.sh
+++ b/tests/functional/gc.sh
diff --git a/tests/hash-check.nix b/tests/functional/hash-check.nix
index 4a8e9b8a8..4a8e9b8a8 100644
--- a/tests/hash-check.nix
+++ b/tests/functional/hash-check.nix
diff --git a/tests/hash.sh b/tests/functional/hash.sh
index 34c1bb38a..34c1bb38a 100644
--- a/tests/hash.sh
+++ b/tests/functional/hash.sh
diff --git a/tests/hermetic.nix b/tests/functional/hermetic.nix
index 4c9d7a51f..4c9d7a51f 100644
--- a/tests/hermetic.nix
+++ b/tests/functional/hermetic.nix
diff --git a/tests/import-derivation.nix b/tests/functional/import-derivation.nix
index 44fa9a45d..44fa9a45d 100644
--- a/tests/import-derivation.nix
+++ b/tests/functional/import-derivation.nix
diff --git a/tests/import-derivation.sh b/tests/functional/import-derivation.sh
index 98d61ef49..98d61ef49 100644
--- a/tests/import-derivation.sh
+++ b/tests/functional/import-derivation.sh
diff --git a/tests/impure-derivations.nix b/tests/functional/impure-derivations.nix
index 98547e6c1..98547e6c1 100644
--- a/tests/impure-derivations.nix
+++ b/tests/functional/impure-derivations.nix
diff --git a/tests/impure-derivations.sh b/tests/functional/impure-derivations.sh
index 39d053a04..39d053a04 100644
--- a/tests/impure-derivations.sh
+++ b/tests/functional/impure-derivations.sh
diff --git a/tests/init.sh b/tests/functional/init.sh
index c420e8c9f..c420e8c9f 100755
--- a/tests/init.sh
+++ b/tests/functional/init.sh
diff --git a/tests/install-darwin.sh b/tests/functional/install-darwin.sh
index ea2b75323..ea2b75323 100755
--- a/tests/install-darwin.sh
+++ b/tests/functional/install-darwin.sh
diff --git a/tests/lang-test-infra.sh b/tests/functional/lang-test-infra.sh
index 30da8977b..30da8977b 100644
--- a/tests/lang-test-infra.sh
+++ b/tests/functional/lang-test-infra.sh
diff --git a/tests/lang.sh b/tests/functional/lang.sh
index 75dbbc38e..f4760eced 100755
--- a/tests/lang.sh
+++ b/tests/functional/lang.sh
@@ -134,7 +134,7 @@ else
         echo ''
         echo 'You can rerun this test with:'
         echo ''
-        echo '    _NIX_TEST_ACCEPT=1 make tests/lang.sh.test'
+        echo '    _NIX_TEST_ACCEPT=1 make tests/functional/lang.sh.test'
         echo ''
         echo 'to regenerate the files containing the expected output,'
         echo 'and then view the git diff to decide whether a change is'
diff --git a/tests/lang/binary-data b/tests/functional/lang/binary-data
index 06d740502..06d740502 100644
--- a/tests/lang/binary-data
+++ b/tests/functional/lang/binary-data
diff --git a/tests/lang/data b/tests/functional/lang/data
index 257cc5642..257cc5642 100644
--- a/tests/lang/data
+++ b/tests/functional/lang/data
diff --git a/tests/lang/dir1/a.nix b/tests/functional/lang/dir1/a.nix
index 231f150c5..231f150c5 100644
--- a/tests/lang/dir1/a.nix
+++ b/tests/functional/lang/dir1/a.nix
diff --git a/tests/lang/dir2/a.nix b/tests/functional/lang/dir2/a.nix
index 170df520a..170df520a 100644
--- a/tests/lang/dir2/a.nix
+++ b/tests/functional/lang/dir2/a.nix
diff --git a/tests/lang/dir2/b.nix b/tests/functional/lang/dir2/b.nix
index 19010cc35..19010cc35 100644
--- a/tests/lang/dir2/b.nix
+++ b/tests/functional/lang/dir2/b.nix
diff --git a/tests/lang/dir3/a.nix b/tests/functional/lang/dir3/a.nix
index 170df520a..170df520a 100644
--- a/tests/lang/dir3/a.nix
+++ b/tests/functional/lang/dir3/a.nix
diff --git a/tests/lang/dir3/b.nix b/tests/functional/lang/dir3/b.nix
index 170df520a..170df520a 100644
--- a/tests/lang/dir3/b.nix
+++ b/tests/functional/lang/dir3/b.nix
diff --git a/tests/lang/dir3/c.nix b/tests/functional/lang/dir3/c.nix
index cdf158597..cdf158597 100644
--- a/tests/lang/dir3/c.nix
+++ b/tests/functional/lang/dir3/c.nix
diff --git a/tests/lang/dir4/a.nix b/tests/functional/lang/dir4/a.nix
index 170df520a..170df520a 100644
--- a/tests/lang/dir4/a.nix
+++ b/tests/functional/lang/dir4/a.nix
diff --git a/tests/lang/dir4/c.nix b/tests/functional/lang/dir4/c.nix
index 170df520a..170df520a 100644
--- a/tests/lang/dir4/c.nix
+++ b/tests/functional/lang/dir4/c.nix
diff --git a/tests/lang/empty.exp b/tests/functional/lang/empty.exp
index e69de29bb..e69de29bb 100644
--- a/tests/lang/empty.exp
+++ b/tests/functional/lang/empty.exp
diff --git a/tests/lang/eval-fail-abort.err.exp b/tests/functional/lang/eval-fail-abort.err.exp
index 345232d3f..345232d3f 100644
--- a/tests/lang/eval-fail-abort.err.exp
+++ b/tests/functional/lang/eval-fail-abort.err.exp
diff --git a/tests/lang/eval-fail-abort.nix b/tests/functional/lang/eval-fail-abort.nix
index 75c51bceb..75c51bceb 100644
--- a/tests/lang/eval-fail-abort.nix
+++ b/tests/functional/lang/eval-fail-abort.nix
diff --git a/tests/lang/eval-fail-antiquoted-path.err.exp b/tests/functional/lang/eval-fail-antiquoted-path.err.exp
index 425deba42..425deba42 100644
--- a/tests/lang/eval-fail-antiquoted-path.err.exp
+++ b/tests/functional/lang/eval-fail-antiquoted-path.err.exp
diff --git a/tests/lang/eval-fail-assert.err.exp b/tests/functional/lang/eval-fail-assert.err.exp
index aeecd8167..aeecd8167 100644
--- a/tests/lang/eval-fail-assert.err.exp
+++ b/tests/functional/lang/eval-fail-assert.err.exp
diff --git a/tests/lang/eval-fail-assert.nix b/tests/functional/lang/eval-fail-assert.nix
index 3b7a1e8bf..3b7a1e8bf 100644
--- a/tests/lang/eval-fail-assert.nix
+++ b/tests/functional/lang/eval-fail-assert.nix
diff --git a/tests/lang/eval-fail-bad-antiquote-1.err.exp b/tests/functional/lang/eval-fail-bad-antiquote-1.err.exp
index cf94f53bc..cf94f53bc 100644
--- a/tests/lang/eval-fail-bad-antiquote-1.err.exp
+++ b/tests/functional/lang/eval-fail-bad-antiquote-1.err.exp
diff --git a/tests/lang/eval-fail-bad-antiquote-2.err.exp b/tests/functional/lang/eval-fail-bad-antiquote-2.err.exp
index c8fe39d12..c8fe39d12 100644
--- a/tests/lang/eval-fail-bad-antiquote-2.err.exp
+++ b/tests/functional/lang/eval-fail-bad-antiquote-2.err.exp
diff --git a/tests/lang/eval-fail-bad-antiquote-3.err.exp b/tests/functional/lang/eval-fail-bad-antiquote-3.err.exp
index fbefbc826..fbefbc826 100644
--- a/tests/lang/eval-fail-bad-antiquote-3.err.exp
+++ b/tests/functional/lang/eval-fail-bad-antiquote-3.err.exp
diff --git a/tests/lang/eval-fail-bad-string-interpolation-1.err.exp b/tests/functional/lang/eval-fail-bad-string-interpolation-1.err.exp
index eb73e9a52..eb73e9a52 100644
--- a/tests/lang/eval-fail-bad-string-interpolation-1.err.exp
+++ b/tests/functional/lang/eval-fail-bad-string-interpolation-1.err.exp
diff --git a/tests/lang/eval-fail-bad-string-interpolation-1.nix b/tests/functional/lang/eval-fail-bad-string-interpolation-1.nix
index ffe9c983c..ffe9c983c 100644
--- a/tests/lang/eval-fail-bad-string-interpolation-1.nix
+++ b/tests/functional/lang/eval-fail-bad-string-interpolation-1.nix
diff --git a/tests/lang/eval-fail-bad-string-interpolation-2.err.exp b/tests/functional/lang/eval-fail-bad-string-interpolation-2.err.exp
index c8fe39d12..c8fe39d12 100644
--- a/tests/lang/eval-fail-bad-string-interpolation-2.err.exp
+++ b/tests/functional/lang/eval-fail-bad-string-interpolation-2.err.exp
diff --git a/tests/lang/eval-fail-bad-string-interpolation-2.nix b/tests/functional/lang/eval-fail-bad-string-interpolation-2.nix
index 3745235ce..3745235ce 100644
--- a/tests/lang/eval-fail-bad-string-interpolation-2.nix
+++ b/tests/functional/lang/eval-fail-bad-string-interpolation-2.nix
diff --git a/tests/lang/eval-fail-bad-string-interpolation-3.err.exp b/tests/functional/lang/eval-fail-bad-string-interpolation-3.err.exp
index ac14f329b..ac14f329b 100644
--- a/tests/lang/eval-fail-bad-string-interpolation-3.err.exp
+++ b/tests/functional/lang/eval-fail-bad-string-interpolation-3.err.exp
diff --git a/tests/lang/eval-fail-bad-string-interpolation-3.nix b/tests/functional/lang/eval-fail-bad-string-interpolation-3.nix
index 65b9d4f50..65b9d4f50 100644
--- a/tests/lang/eval-fail-bad-string-interpolation-3.nix
+++ b/tests/functional/lang/eval-fail-bad-string-interpolation-3.nix
diff --git a/tests/lang/eval-fail-blackhole.err.exp b/tests/functional/lang/eval-fail-blackhole.err.exp
index f0618d8ac..f0618d8ac 100644
--- a/tests/lang/eval-fail-blackhole.err.exp
+++ b/tests/functional/lang/eval-fail-blackhole.err.exp
diff --git a/tests/lang/eval-fail-blackhole.nix b/tests/functional/lang/eval-fail-blackhole.nix
index 81133b511..81133b511 100644
--- a/tests/lang/eval-fail-blackhole.nix
+++ b/tests/functional/lang/eval-fail-blackhole.nix
diff --git a/tests/lang/eval-fail-deepseq.err.exp b/tests/functional/lang/eval-fail-deepseq.err.exp
index 5e204ba73..5e204ba73 100644
--- a/tests/lang/eval-fail-deepseq.err.exp
+++ b/tests/functional/lang/eval-fail-deepseq.err.exp
diff --git a/tests/lang/eval-fail-deepseq.nix b/tests/functional/lang/eval-fail-deepseq.nix
index 9baa49b06..9baa49b06 100644
--- a/tests/lang/eval-fail-deepseq.nix
+++ b/tests/functional/lang/eval-fail-deepseq.nix
diff --git a/tests/lang/eval-fail-dup-dynamic-attrs.err.exp b/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp
index e01f8e6d0..e01f8e6d0 100644
--- a/tests/lang/eval-fail-dup-dynamic-attrs.err.exp
+++ b/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp
diff --git a/tests/lang/eval-fail-dup-dynamic-attrs.nix b/tests/functional/lang/eval-fail-dup-dynamic-attrs.nix
index 7ea17f6c8..7ea17f6c8 100644
--- a/tests/lang/eval-fail-dup-dynamic-attrs.nix
+++ b/tests/functional/lang/eval-fail-dup-dynamic-attrs.nix
diff --git a/tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp b/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp
index 0069285fb..0069285fb 100644
--- a/tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp
+++ b/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp
diff --git a/tests/lang/eval-fail-foldlStrict-strict-op-application.nix b/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.nix
index 1620cc76e..1620cc76e 100644
--- a/tests/lang/eval-fail-foldlStrict-strict-op-application.nix
+++ b/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.nix
diff --git a/tests/lang/eval-fail-fromTOML-timestamps.err.exp b/tests/functional/lang/eval-fail-fromTOML-timestamps.err.exp
index f6bd19f5a..f6bd19f5a 100644
--- a/tests/lang/eval-fail-fromTOML-timestamps.err.exp
+++ b/tests/functional/lang/eval-fail-fromTOML-timestamps.err.exp
diff --git a/tests/lang/eval-fail-fromTOML-timestamps.nix b/tests/functional/lang/eval-fail-fromTOML-timestamps.nix
index 74cff9470..74cff9470 100644
--- a/tests/lang/eval-fail-fromTOML-timestamps.nix
+++ b/tests/functional/lang/eval-fail-fromTOML-timestamps.nix
diff --git a/tests/lang/eval-fail-hashfile-missing.err.exp b/tests/functional/lang/eval-fail-hashfile-missing.err.exp
index 8e77dec1e..8e77dec1e 100644
--- a/tests/lang/eval-fail-hashfile-missing.err.exp
+++ b/tests/functional/lang/eval-fail-hashfile-missing.err.exp
diff --git a/tests/lang/eval-fail-hashfile-missing.nix b/tests/functional/lang/eval-fail-hashfile-missing.nix
index ce098b823..ce098b823 100644
--- a/tests/lang/eval-fail-hashfile-missing.nix
+++ b/tests/functional/lang/eval-fail-hashfile-missing.nix
diff --git a/tests/lang/eval-fail-list.err.exp b/tests/functional/lang/eval-fail-list.err.exp
index 24d682118..24d682118 100644
--- a/tests/lang/eval-fail-list.err.exp
+++ b/tests/functional/lang/eval-fail-list.err.exp
diff --git a/tests/lang/eval-fail-list.nix b/tests/functional/lang/eval-fail-list.nix
index fa749f2f7..fa749f2f7 100644
--- a/tests/lang/eval-fail-list.nix
+++ b/tests/functional/lang/eval-fail-list.nix
diff --git a/tests/lang/eval-fail-missing-arg.err.exp b/tests/functional/lang/eval-fail-missing-arg.err.exp
index 61fabf0d5..61fabf0d5 100644
--- a/tests/lang/eval-fail-missing-arg.err.exp
+++ b/tests/functional/lang/eval-fail-missing-arg.err.exp
diff --git a/tests/lang/eval-fail-missing-arg.nix b/tests/functional/lang/eval-fail-missing-arg.nix
index c4be9797c..c4be9797c 100644
--- a/tests/lang/eval-fail-missing-arg.nix
+++ b/tests/functional/lang/eval-fail-missing-arg.nix
diff --git a/tests/lang/eval-fail-nonexist-path.err.exp b/tests/functional/lang/eval-fail-nonexist-path.err.exp
index c8fe39d12..c8fe39d12 100644
--- a/tests/lang/eval-fail-nonexist-path.err.exp
+++ b/tests/functional/lang/eval-fail-nonexist-path.err.exp
diff --git a/tests/lang/eval-fail-nonexist-path.nix b/tests/functional/lang/eval-fail-nonexist-path.nix
index f2f08107b..f2f08107b 100644
--- a/tests/lang/eval-fail-nonexist-path.nix
+++ b/tests/functional/lang/eval-fail-nonexist-path.nix
diff --git a/tests/lang/eval-fail-path-slash.err.exp b/tests/functional/lang/eval-fail-path-slash.err.exp
index f0011c97f..f0011c97f 100644
--- a/tests/lang/eval-fail-path-slash.err.exp
+++ b/tests/functional/lang/eval-fail-path-slash.err.exp
diff --git a/tests/lang/eval-fail-path-slash.nix b/tests/functional/lang/eval-fail-path-slash.nix
index 8c2e104c7..8c2e104c7 100644
--- a/tests/lang/eval-fail-path-slash.nix
+++ b/tests/functional/lang/eval-fail-path-slash.nix
diff --git a/tests/lang/eval-fail-recursion.err.exp b/tests/functional/lang/eval-fail-recursion.err.exp
index af64133cb..af64133cb 100644
--- a/tests/lang/eval-fail-recursion.err.exp
+++ b/tests/functional/lang/eval-fail-recursion.err.exp
diff --git a/tests/lang/eval-fail-recursion.nix b/tests/functional/lang/eval-fail-recursion.nix
index 075b5ed06..075b5ed06 100644
--- a/tests/lang/eval-fail-recursion.nix
+++ b/tests/functional/lang/eval-fail-recursion.nix
diff --git a/tests/lang/eval-fail-remove.err.exp b/tests/functional/lang/eval-fail-remove.err.exp
index e82cdac98..e82cdac98 100644
--- a/tests/lang/eval-fail-remove.err.exp
+++ b/tests/functional/lang/eval-fail-remove.err.exp
diff --git a/tests/lang/eval-fail-remove.nix b/tests/functional/lang/eval-fail-remove.nix
index 539e0eb0a..539e0eb0a 100644
--- a/tests/lang/eval-fail-remove.nix
+++ b/tests/functional/lang/eval-fail-remove.nix
diff --git a/tests/lang/eval-fail-scope-5.err.exp b/tests/functional/lang/eval-fail-scope-5.err.exp
index 22b6166f8..22b6166f8 100644
--- a/tests/lang/eval-fail-scope-5.err.exp
+++ b/tests/functional/lang/eval-fail-scope-5.err.exp
diff --git a/tests/lang/eval-fail-scope-5.nix b/tests/functional/lang/eval-fail-scope-5.nix
index f89a65a99..f89a65a99 100644
--- a/tests/lang/eval-fail-scope-5.nix
+++ b/tests/functional/lang/eval-fail-scope-5.nix
diff --git a/tests/lang/eval-fail-seq.err.exp b/tests/functional/lang/eval-fail-seq.err.exp
index 33a7e9491..33a7e9491 100644
--- a/tests/lang/eval-fail-seq.err.exp
+++ b/tests/functional/lang/eval-fail-seq.err.exp
diff --git a/tests/lang/eval-fail-seq.nix b/tests/functional/lang/eval-fail-seq.nix
index cddbbfd32..cddbbfd32 100644
--- a/tests/lang/eval-fail-seq.nix
+++ b/tests/functional/lang/eval-fail-seq.nix
diff --git a/tests/lang/eval-fail-set-override.err.exp b/tests/functional/lang/eval-fail-set-override.err.exp
index beb29d678..beb29d678 100644
--- a/tests/lang/eval-fail-set-override.err.exp
+++ b/tests/functional/lang/eval-fail-set-override.err.exp
diff --git a/tests/lang/eval-fail-set-override.nix b/tests/functional/lang/eval-fail-set-override.nix
index 03551c186..03551c186 100644
--- a/tests/lang/eval-fail-set-override.nix
+++ b/tests/functional/lang/eval-fail-set-override.nix
diff --git a/tests/lang/eval-fail-set.err.exp b/tests/functional/lang/eval-fail-set.err.exp
index 0d0140508..0d0140508 100644
--- a/tests/lang/eval-fail-set.err.exp
+++ b/tests/functional/lang/eval-fail-set.err.exp
diff --git a/tests/lang/eval-fail-set.nix b/tests/functional/lang/eval-fail-set.nix
index c6b7980b6..c6b7980b6 100644
--- a/tests/lang/eval-fail-set.nix
+++ b/tests/functional/lang/eval-fail-set.nix
diff --git a/tests/lang/eval-fail-substring.err.exp b/tests/functional/lang/eval-fail-substring.err.exp
index dc26a00bd..dc26a00bd 100644
--- a/tests/lang/eval-fail-substring.err.exp
+++ b/tests/functional/lang/eval-fail-substring.err.exp
diff --git a/tests/lang/eval-fail-substring.nix b/tests/functional/lang/eval-fail-substring.nix
index f37c2bc0a..f37c2bc0a 100644
--- a/tests/lang/eval-fail-substring.nix
+++ b/tests/functional/lang/eval-fail-substring.nix
diff --git a/tests/lang/eval-fail-to-path.err.exp b/tests/functional/lang/eval-fail-to-path.err.exp
index 43ed2bdfc..43ed2bdfc 100644
--- a/tests/lang/eval-fail-to-path.err.exp
+++ b/tests/functional/lang/eval-fail-to-path.err.exp
diff --git a/tests/lang/eval-fail-to-path.nix b/tests/functional/lang/eval-fail-to-path.nix
index 5e322bc31..5e322bc31 100644
--- a/tests/lang/eval-fail-to-path.nix
+++ b/tests/functional/lang/eval-fail-to-path.nix
diff --git a/tests/lang/eval-fail-toJSON.err.exp b/tests/functional/lang/eval-fail-toJSON.err.exp
index 4e618c203..4e618c203 100644
--- a/tests/lang/eval-fail-toJSON.err.exp
+++ b/tests/functional/lang/eval-fail-toJSON.err.exp
diff --git a/tests/lang/eval-fail-toJSON.nix b/tests/functional/lang/eval-fail-toJSON.nix
index 8112e1c1f..8112e1c1f 100644
--- a/tests/lang/eval-fail-toJSON.nix
+++ b/tests/functional/lang/eval-fail-toJSON.nix
diff --git a/tests/lang/eval-fail-undeclared-arg.err.exp b/tests/functional/lang/eval-fail-undeclared-arg.err.exp
index 30db743c7..30db743c7 100644
--- a/tests/lang/eval-fail-undeclared-arg.err.exp
+++ b/tests/functional/lang/eval-fail-undeclared-arg.err.exp
diff --git a/tests/lang/eval-fail-undeclared-arg.nix b/tests/functional/lang/eval-fail-undeclared-arg.nix
index cafdf1636..cafdf1636 100644
--- a/tests/lang/eval-fail-undeclared-arg.nix
+++ b/tests/functional/lang/eval-fail-undeclared-arg.nix
diff --git a/tests/lang/eval-okay-any-all.exp b/tests/functional/lang/eval-okay-any-all.exp
index eb273f45b..eb273f45b 100644
--- a/tests/lang/eval-okay-any-all.exp
+++ b/tests/functional/lang/eval-okay-any-all.exp
diff --git a/tests/lang/eval-okay-any-all.nix b/tests/functional/lang/eval-okay-any-all.nix
index a3f26ea2a..a3f26ea2a 100644
--- a/tests/lang/eval-okay-any-all.nix
+++ b/tests/functional/lang/eval-okay-any-all.nix
diff --git a/tests/lang/eval-okay-arithmetic.exp b/tests/functional/lang/eval-okay-arithmetic.exp
index 5c54d10b7..5c54d10b7 100644
--- a/tests/lang/eval-okay-arithmetic.exp
+++ b/tests/functional/lang/eval-okay-arithmetic.exp
diff --git a/tests/lang/eval-okay-arithmetic.nix b/tests/functional/lang/eval-okay-arithmetic.nix
index 7e9e6a0b6..7e9e6a0b6 100644
--- a/tests/lang/eval-okay-arithmetic.nix
+++ b/tests/functional/lang/eval-okay-arithmetic.nix
diff --git a/tests/lang/eval-okay-attrnames.exp b/tests/functional/lang/eval-okay-attrnames.exp
index b4aa387e0..b4aa387e0 100644
--- a/tests/lang/eval-okay-attrnames.exp
+++ b/tests/functional/lang/eval-okay-attrnames.exp
diff --git a/tests/lang/eval-okay-attrnames.nix b/tests/functional/lang/eval-okay-attrnames.nix
index e5b26e9f2..e5b26e9f2 100644
--- a/tests/lang/eval-okay-attrnames.nix
+++ b/tests/functional/lang/eval-okay-attrnames.nix
diff --git a/tests/lang/eval-okay-attrs.exp b/tests/functional/lang/eval-okay-attrs.exp
index 45b0f829e..45b0f829e 100644
--- a/tests/lang/eval-okay-attrs.exp
+++ b/tests/functional/lang/eval-okay-attrs.exp
diff --git a/tests/lang/eval-okay-attrs.nix b/tests/functional/lang/eval-okay-attrs.nix
index 810b31a5d..810b31a5d 100644
--- a/tests/lang/eval-okay-attrs.nix
+++ b/tests/functional/lang/eval-okay-attrs.nix
diff --git a/tests/lang/eval-okay-attrs2.exp b/tests/functional/lang/eval-okay-attrs2.exp
index 45b0f829e..45b0f829e 100644
--- a/tests/lang/eval-okay-attrs2.exp
+++ b/tests/functional/lang/eval-okay-attrs2.exp
diff --git a/tests/lang/eval-okay-attrs2.nix b/tests/functional/lang/eval-okay-attrs2.nix
index 9e06b83ac..9e06b83ac 100644
--- a/tests/lang/eval-okay-attrs2.nix
+++ b/tests/functional/lang/eval-okay-attrs2.nix
diff --git a/tests/lang/eval-okay-attrs3.exp b/tests/functional/lang/eval-okay-attrs3.exp
index 19de4fdf7..19de4fdf7 100644
--- a/tests/lang/eval-okay-attrs3.exp
+++ b/tests/functional/lang/eval-okay-attrs3.exp
diff --git a/tests/lang/eval-okay-attrs3.nix b/tests/functional/lang/eval-okay-attrs3.nix
index f29de11fe..f29de11fe 100644
--- a/tests/lang/eval-okay-attrs3.nix
+++ b/tests/functional/lang/eval-okay-attrs3.nix
diff --git a/tests/lang/eval-okay-attrs4.exp b/tests/functional/lang/eval-okay-attrs4.exp
index 185173144..185173144 100644
--- a/tests/lang/eval-okay-attrs4.exp
+++ b/tests/functional/lang/eval-okay-attrs4.exp
diff --git a/tests/lang/eval-okay-attrs4.nix b/tests/functional/lang/eval-okay-attrs4.nix
index 43ec81210..43ec81210 100644
--- a/tests/lang/eval-okay-attrs4.nix
+++ b/tests/functional/lang/eval-okay-attrs4.nix
diff --git a/tests/lang/eval-okay-attrs5.exp b/tests/functional/lang/eval-okay-attrs5.exp
index ce0430d78..ce0430d78 100644
--- a/tests/lang/eval-okay-attrs5.exp
+++ b/tests/functional/lang/eval-okay-attrs5.exp
diff --git a/tests/lang/eval-okay-attrs5.nix b/tests/functional/lang/eval-okay-attrs5.nix
index a4584cd3b..a4584cd3b 100644
--- a/tests/lang/eval-okay-attrs5.nix
+++ b/tests/functional/lang/eval-okay-attrs5.nix
diff --git a/tests/lang/eval-okay-attrs6.exp b/tests/functional/lang/eval-okay-attrs6.exp
index b46938032..b46938032 100644
--- a/tests/lang/eval-okay-attrs6.exp
+++ b/tests/functional/lang/eval-okay-attrs6.exp
diff --git a/tests/lang/eval-okay-attrs6.nix b/tests/functional/lang/eval-okay-attrs6.nix
index 2e5c85483..2e5c85483 100644
--- a/tests/lang/eval-okay-attrs6.nix
+++ b/tests/functional/lang/eval-okay-attrs6.nix
diff --git a/tests/lang/eval-okay-autoargs.exp b/tests/functional/lang/eval-okay-autoargs.exp
index 7a8391786..7a8391786 100644
--- a/tests/lang/eval-okay-autoargs.exp
+++ b/tests/functional/lang/eval-okay-autoargs.exp
diff --git a/tests/lang/eval-okay-autoargs.flags b/tests/functional/lang/eval-okay-autoargs.flags
index ae3762254..ae3762254 100644
--- a/tests/lang/eval-okay-autoargs.flags
+++ b/tests/functional/lang/eval-okay-autoargs.flags
diff --git a/tests/lang/eval-okay-autoargs.nix b/tests/functional/lang/eval-okay-autoargs.nix
index 815f51b1d..815f51b1d 100644
--- a/tests/lang/eval-okay-autoargs.nix
+++ b/tests/functional/lang/eval-okay-autoargs.nix
diff --git a/tests/lang/eval-okay-backslash-newline-1.exp b/tests/functional/lang/eval-okay-backslash-newline-1.exp
index 3e754364c..3e754364c 100644
--- a/tests/lang/eval-okay-backslash-newline-1.exp
+++ b/tests/functional/lang/eval-okay-backslash-newline-1.exp
diff --git a/tests/lang/eval-okay-backslash-newline-1.nix b/tests/functional/lang/eval-okay-backslash-newline-1.nix
index 7fef3dddd..7fef3dddd 100644
--- a/tests/lang/eval-okay-backslash-newline-1.nix
+++ b/tests/functional/lang/eval-okay-backslash-newline-1.nix
diff --git a/tests/lang/eval-okay-backslash-newline-2.exp b/tests/functional/lang/eval-okay-backslash-newline-2.exp
index 3e754364c..3e754364c 100644
--- a/tests/lang/eval-okay-backslash-newline-2.exp
+++ b/tests/functional/lang/eval-okay-backslash-newline-2.exp
diff --git a/tests/lang/eval-okay-backslash-newline-2.nix b/tests/functional/lang/eval-okay-backslash-newline-2.nix
index 35ddf495c..35ddf495c 100644
--- a/tests/lang/eval-okay-backslash-newline-2.nix
+++ b/tests/functional/lang/eval-okay-backslash-newline-2.nix
diff --git a/tests/lang/eval-okay-builtins-add.exp b/tests/functional/lang/eval-okay-builtins-add.exp
index 0350b518a..0350b518a 100644
--- a/tests/lang/eval-okay-builtins-add.exp
+++ b/tests/functional/lang/eval-okay-builtins-add.exp
diff --git a/tests/lang/eval-okay-builtins-add.nix b/tests/functional/lang/eval-okay-builtins-add.nix
index c84181622..c84181622 100644
--- a/tests/lang/eval-okay-builtins-add.nix
+++ b/tests/functional/lang/eval-okay-builtins-add.nix
diff --git a/tests/lang/eval-okay-builtins.exp b/tests/functional/lang/eval-okay-builtins.exp
index 0661686d6..0661686d6 100644
--- a/tests/lang/eval-okay-builtins.exp
+++ b/tests/functional/lang/eval-okay-builtins.exp
diff --git a/tests/lang/eval-okay-builtins.nix b/tests/functional/lang/eval-okay-builtins.nix
index e9d65e88a..e9d65e88a 100644
--- a/tests/lang/eval-okay-builtins.nix
+++ b/tests/functional/lang/eval-okay-builtins.nix
diff --git a/tests/lang/eval-okay-callable-attrs.exp b/tests/functional/lang/eval-okay-callable-attrs.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-callable-attrs.exp
+++ b/tests/functional/lang/eval-okay-callable-attrs.exp
diff --git a/tests/lang/eval-okay-callable-attrs.nix b/tests/functional/lang/eval-okay-callable-attrs.nix
index 310a030df..310a030df 100644
--- a/tests/lang/eval-okay-callable-attrs.nix
+++ b/tests/functional/lang/eval-okay-callable-attrs.nix
diff --git a/tests/lang/eval-okay-catattrs.exp b/tests/functional/lang/eval-okay-catattrs.exp
index b4a1e66d6..b4a1e66d6 100644
--- a/tests/lang/eval-okay-catattrs.exp
+++ b/tests/functional/lang/eval-okay-catattrs.exp
diff --git a/tests/lang/eval-okay-catattrs.nix b/tests/functional/lang/eval-okay-catattrs.nix
index 2c3dc10da..2c3dc10da 100644
--- a/tests/lang/eval-okay-catattrs.nix
+++ b/tests/functional/lang/eval-okay-catattrs.nix
diff --git a/tests/lang/eval-okay-closure.exp b/tests/functional/lang/eval-okay-closure.exp
index e7dbf9781..e7dbf9781 100644
--- a/tests/lang/eval-okay-closure.exp
+++ b/tests/functional/lang/eval-okay-closure.exp
diff --git a/tests/lang/eval-okay-closure.exp.xml b/tests/functional/lang/eval-okay-closure.exp.xml
index dffc03a99..dffc03a99 100644
--- a/tests/lang/eval-okay-closure.exp.xml
+++ b/tests/functional/lang/eval-okay-closure.exp.xml
diff --git a/tests/lang/eval-okay-closure.nix b/tests/functional/lang/eval-okay-closure.nix
index cccd4dc35..cccd4dc35 100644
--- a/tests/lang/eval-okay-closure.nix
+++ b/tests/functional/lang/eval-okay-closure.nix
diff --git a/tests/lang/eval-okay-comments.exp b/tests/functional/lang/eval-okay-comments.exp
index 7182dc2f9..7182dc2f9 100644
--- a/tests/lang/eval-okay-comments.exp
+++ b/tests/functional/lang/eval-okay-comments.exp
diff --git a/tests/lang/eval-okay-comments.nix b/tests/functional/lang/eval-okay-comments.nix
index cb2cce218..cb2cce218 100644
--- a/tests/lang/eval-okay-comments.nix
+++ b/tests/functional/lang/eval-okay-comments.nix
diff --git a/tests/lang/eval-okay-concat.exp b/tests/functional/lang/eval-okay-concat.exp
index bb4bbd577..bb4bbd577 100644
--- a/tests/lang/eval-okay-concat.exp
+++ b/tests/functional/lang/eval-okay-concat.exp
diff --git a/tests/lang/eval-okay-concat.nix b/tests/functional/lang/eval-okay-concat.nix
index d158a9bf0..d158a9bf0 100644
--- a/tests/lang/eval-okay-concat.nix
+++ b/tests/functional/lang/eval-okay-concat.nix
diff --git a/tests/lang/eval-okay-concatmap.exp b/tests/functional/lang/eval-okay-concatmap.exp
index 3b8be7739..3b8be7739 100644
--- a/tests/lang/eval-okay-concatmap.exp
+++ b/tests/functional/lang/eval-okay-concatmap.exp
diff --git a/tests/lang/eval-okay-concatmap.nix b/tests/functional/lang/eval-okay-concatmap.nix
index 97da5d37a..97da5d37a 100644
--- a/tests/lang/eval-okay-concatmap.nix
+++ b/tests/functional/lang/eval-okay-concatmap.nix
diff --git a/tests/lang/eval-okay-concatstringssep.exp b/tests/functional/lang/eval-okay-concatstringssep.exp
index 93987647f..93987647f 100644
--- a/tests/lang/eval-okay-concatstringssep.exp
+++ b/tests/functional/lang/eval-okay-concatstringssep.exp
diff --git a/tests/lang/eval-okay-concatstringssep.nix b/tests/functional/lang/eval-okay-concatstringssep.nix
index adc4c41bd..adc4c41bd 100644
--- a/tests/lang/eval-okay-concatstringssep.nix
+++ b/tests/functional/lang/eval-okay-concatstringssep.nix
diff --git a/tests/lang/eval-okay-context-introspection.exp b/tests/functional/lang/eval-okay-context-introspection.exp
index 03b400cc8..03b400cc8 100644
--- a/tests/lang/eval-okay-context-introspection.exp
+++ b/tests/functional/lang/eval-okay-context-introspection.exp
diff --git a/tests/lang/eval-okay-context-introspection.nix b/tests/functional/lang/eval-okay-context-introspection.nix
index 50a78d946..50a78d946 100644
--- a/tests/lang/eval-okay-context-introspection.nix
+++ b/tests/functional/lang/eval-okay-context-introspection.nix
diff --git a/tests/lang/eval-okay-context.exp b/tests/functional/lang/eval-okay-context.exp
index 2f535bdbc..2f535bdbc 100644
--- a/tests/lang/eval-okay-context.exp
+++ b/tests/functional/lang/eval-okay-context.exp
diff --git a/tests/lang/eval-okay-context.nix b/tests/functional/lang/eval-okay-context.nix
index 7b9531cfe..7b9531cfe 100644
--- a/tests/lang/eval-okay-context.nix
+++ b/tests/functional/lang/eval-okay-context.nix
diff --git a/tests/lang/eval-okay-curpos.exp b/tests/functional/lang/eval-okay-curpos.exp
index 65fd65b4d..65fd65b4d 100644
--- a/tests/lang/eval-okay-curpos.exp
+++ b/tests/functional/lang/eval-okay-curpos.exp
diff --git a/tests/lang/eval-okay-curpos.nix b/tests/functional/lang/eval-okay-curpos.nix
index b79553df0..b79553df0 100644
--- a/tests/lang/eval-okay-curpos.nix
+++ b/tests/functional/lang/eval-okay-curpos.nix
diff --git a/tests/lang/eval-okay-deepseq.exp b/tests/functional/lang/eval-okay-deepseq.exp
index 8d38505c1..8d38505c1 100644
--- a/tests/lang/eval-okay-deepseq.exp
+++ b/tests/functional/lang/eval-okay-deepseq.exp
diff --git a/tests/lang/eval-okay-deepseq.nix b/tests/functional/lang/eval-okay-deepseq.nix
index 53aa4b1dc..53aa4b1dc 100644
--- a/tests/lang/eval-okay-deepseq.nix
+++ b/tests/functional/lang/eval-okay-deepseq.nix
diff --git a/tests/lang/eval-okay-delayed-with-inherit.exp b/tests/functional/lang/eval-okay-delayed-with-inherit.exp
index eaacb55c1..eaacb55c1 100644
--- a/tests/lang/eval-okay-delayed-with-inherit.exp
+++ b/tests/functional/lang/eval-okay-delayed-with-inherit.exp
diff --git a/tests/lang/eval-okay-delayed-with-inherit.nix b/tests/functional/lang/eval-okay-delayed-with-inherit.nix
index 84b388c27..84b388c27 100644
--- a/tests/lang/eval-okay-delayed-with-inherit.nix
+++ b/tests/functional/lang/eval-okay-delayed-with-inherit.nix
diff --git a/tests/lang/eval-okay-delayed-with.exp b/tests/functional/lang/eval-okay-delayed-with.exp
index 8e7c61ab8..8e7c61ab8 100644
--- a/tests/lang/eval-okay-delayed-with.exp
+++ b/tests/functional/lang/eval-okay-delayed-with.exp
diff --git a/tests/lang/eval-okay-delayed-with.nix b/tests/functional/lang/eval-okay-delayed-with.nix
index 3fb023e1c..3fb023e1c 100644
--- a/tests/lang/eval-okay-delayed-with.nix
+++ b/tests/functional/lang/eval-okay-delayed-with.nix
diff --git a/tests/lang/eval-okay-dynamic-attrs-2.exp b/tests/functional/lang/eval-okay-dynamic-attrs-2.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-dynamic-attrs-2.exp
+++ b/tests/functional/lang/eval-okay-dynamic-attrs-2.exp
diff --git a/tests/lang/eval-okay-dynamic-attrs-2.nix b/tests/functional/lang/eval-okay-dynamic-attrs-2.nix
index 6d57bf854..6d57bf854 100644
--- a/tests/lang/eval-okay-dynamic-attrs-2.nix
+++ b/tests/functional/lang/eval-okay-dynamic-attrs-2.nix
diff --git a/tests/lang/eval-okay-dynamic-attrs-bare.exp b/tests/functional/lang/eval-okay-dynamic-attrs-bare.exp
index df8750afc..df8750afc 100644
--- a/tests/lang/eval-okay-dynamic-attrs-bare.exp
+++ b/tests/functional/lang/eval-okay-dynamic-attrs-bare.exp
diff --git a/tests/lang/eval-okay-dynamic-attrs-bare.nix b/tests/functional/lang/eval-okay-dynamic-attrs-bare.nix
index 0dbe15e63..0dbe15e63 100644
--- a/tests/lang/eval-okay-dynamic-attrs-bare.nix
+++ b/tests/functional/lang/eval-okay-dynamic-attrs-bare.nix
diff --git a/tests/lang/eval-okay-dynamic-attrs.exp b/tests/functional/lang/eval-okay-dynamic-attrs.exp
index df8750afc..df8750afc 100644
--- a/tests/lang/eval-okay-dynamic-attrs.exp
+++ b/tests/functional/lang/eval-okay-dynamic-attrs.exp
diff --git a/tests/lang/eval-okay-dynamic-attrs.nix b/tests/functional/lang/eval-okay-dynamic-attrs.nix
index ee02ac7e6..ee02ac7e6 100644
--- a/tests/lang/eval-okay-dynamic-attrs.nix
+++ b/tests/functional/lang/eval-okay-dynamic-attrs.nix
diff --git a/tests/lang/eval-okay-elem.exp b/tests/functional/lang/eval-okay-elem.exp
index 3cf6c0e96..3cf6c0e96 100644
--- a/tests/lang/eval-okay-elem.exp
+++ b/tests/functional/lang/eval-okay-elem.exp
diff --git a/tests/lang/eval-okay-elem.nix b/tests/functional/lang/eval-okay-elem.nix
index 71ea7a4ed..71ea7a4ed 100644
--- a/tests/lang/eval-okay-elem.nix
+++ b/tests/functional/lang/eval-okay-elem.nix
diff --git a/tests/lang/eval-okay-empty-args.exp b/tests/functional/lang/eval-okay-empty-args.exp
index cb5537d5d..cb5537d5d 100644
--- a/tests/lang/eval-okay-empty-args.exp
+++ b/tests/functional/lang/eval-okay-empty-args.exp
diff --git a/tests/lang/eval-okay-empty-args.nix b/tests/functional/lang/eval-okay-empty-args.nix
index 78c133afd..78c133afd 100644
--- a/tests/lang/eval-okay-empty-args.nix
+++ b/tests/functional/lang/eval-okay-empty-args.nix
diff --git a/tests/lang/eval-okay-eq-derivations.exp b/tests/functional/lang/eval-okay-eq-derivations.exp
index ec04aab6a..ec04aab6a 100644
--- a/tests/lang/eval-okay-eq-derivations.exp
+++ b/tests/functional/lang/eval-okay-eq-derivations.exp
diff --git a/tests/lang/eval-okay-eq-derivations.nix b/tests/functional/lang/eval-okay-eq-derivations.nix
index d526cb4a2..d526cb4a2 100644
--- a/tests/lang/eval-okay-eq-derivations.nix
+++ b/tests/functional/lang/eval-okay-eq-derivations.nix
diff --git a/tests/lang/eval-okay-eq.exp b/tests/functional/lang/eval-okay-eq.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-eq.exp
+++ b/tests/functional/lang/eval-okay-eq.exp
diff --git a/tests/lang/eval-okay-eq.nix b/tests/functional/lang/eval-okay-eq.nix
index 73d200b38..73d200b38 100644
--- a/tests/lang/eval-okay-eq.nix
+++ b/tests/functional/lang/eval-okay-eq.nix
diff --git a/tests/lang/eval-okay-filter.exp b/tests/functional/lang/eval-okay-filter.exp
index 355d51c27..355d51c27 100644
--- a/tests/lang/eval-okay-filter.exp
+++ b/tests/functional/lang/eval-okay-filter.exp
diff --git a/tests/lang/eval-okay-filter.nix b/tests/functional/lang/eval-okay-filter.nix
index 85109b0d0..85109b0d0 100644
--- a/tests/lang/eval-okay-filter.nix
+++ b/tests/functional/lang/eval-okay-filter.nix
diff --git a/tests/lang/eval-okay-flake-ref-to-string.exp b/tests/functional/lang/eval-okay-flake-ref-to-string.exp
index 110f8442d..110f8442d 100644
--- a/tests/lang/eval-okay-flake-ref-to-string.exp
+++ b/tests/functional/lang/eval-okay-flake-ref-to-string.exp
diff --git a/tests/lang/eval-okay-flake-ref-to-string.nix b/tests/functional/lang/eval-okay-flake-ref-to-string.nix
index dbb4e5b2a..dbb4e5b2a 100644
--- a/tests/lang/eval-okay-flake-ref-to-string.nix
+++ b/tests/functional/lang/eval-okay-flake-ref-to-string.nix
diff --git a/tests/lang/eval-okay-flatten.exp b/tests/functional/lang/eval-okay-flatten.exp
index b979b2b8b..b979b2b8b 100644
--- a/tests/lang/eval-okay-flatten.exp
+++ b/tests/functional/lang/eval-okay-flatten.exp
diff --git a/tests/lang/eval-okay-flatten.nix b/tests/functional/lang/eval-okay-flatten.nix
index fe911e968..fe911e968 100644
--- a/tests/lang/eval-okay-flatten.nix
+++ b/tests/functional/lang/eval-okay-flatten.nix
diff --git a/tests/lang/eval-okay-float.exp b/tests/functional/lang/eval-okay-float.exp
index 3c50a8adc..3c50a8adc 100644
--- a/tests/lang/eval-okay-float.exp
+++ b/tests/functional/lang/eval-okay-float.exp
diff --git a/tests/lang/eval-okay-float.nix b/tests/functional/lang/eval-okay-float.nix
index b2702c7b1..b2702c7b1 100644
--- a/tests/lang/eval-okay-float.nix
+++ b/tests/functional/lang/eval-okay-float.nix
diff --git a/tests/lang/eval-okay-floor-ceil.exp b/tests/functional/lang/eval-okay-floor-ceil.exp
index 81f80420b..81f80420b 100644
--- a/tests/lang/eval-okay-floor-ceil.exp
+++ b/tests/functional/lang/eval-okay-floor-ceil.exp
diff --git a/tests/lang/eval-okay-floor-ceil.nix b/tests/functional/lang/eval-okay-floor-ceil.nix
index d76a0d86e..d76a0d86e 100644
--- a/tests/lang/eval-okay-floor-ceil.nix
+++ b/tests/functional/lang/eval-okay-floor-ceil.nix
diff --git a/tests/lang/eval-okay-foldlStrict-lazy-elements.exp b/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.exp
index d81cc0710..d81cc0710 100644
--- a/tests/lang/eval-okay-foldlStrict-lazy-elements.exp
+++ b/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.exp
diff --git a/tests/lang/eval-okay-foldlStrict-lazy-elements.nix b/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.nix
index c666e07f3..c666e07f3 100644
--- a/tests/lang/eval-okay-foldlStrict-lazy-elements.nix
+++ b/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.nix
diff --git a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp
index d81cc0710..d81cc0710 100644
--- a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp
+++ b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp
diff --git a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix
index abcd5366a..abcd5366a 100644
--- a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix
+++ b/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix
diff --git a/tests/lang/eval-okay-foldlStrict.exp b/tests/functional/lang/eval-okay-foldlStrict.exp
index 837e12b40..837e12b40 100644
--- a/tests/lang/eval-okay-foldlStrict.exp
+++ b/tests/functional/lang/eval-okay-foldlStrict.exp
diff --git a/tests/lang/eval-okay-foldlStrict.nix b/tests/functional/lang/eval-okay-foldlStrict.nix
index 3b87188d2..3b87188d2 100644
--- a/tests/lang/eval-okay-foldlStrict.nix
+++ b/tests/functional/lang/eval-okay-foldlStrict.nix
diff --git a/tests/lang/eval-okay-fromTOML-timestamps.exp b/tests/functional/lang/eval-okay-fromTOML-timestamps.exp
index 08b3c69a6..08b3c69a6 100644
--- a/tests/lang/eval-okay-fromTOML-timestamps.exp
+++ b/tests/functional/lang/eval-okay-fromTOML-timestamps.exp
diff --git a/tests/lang/eval-okay-fromTOML-timestamps.flags b/tests/functional/lang/eval-okay-fromTOML-timestamps.flags
index 9ed39dc6b..9ed39dc6b 100644
--- a/tests/lang/eval-okay-fromTOML-timestamps.flags
+++ b/tests/functional/lang/eval-okay-fromTOML-timestamps.flags
diff --git a/tests/lang/eval-okay-fromTOML-timestamps.nix b/tests/functional/lang/eval-okay-fromTOML-timestamps.nix
index 74cff9470..74cff9470 100644
--- a/tests/lang/eval-okay-fromTOML-timestamps.nix
+++ b/tests/functional/lang/eval-okay-fromTOML-timestamps.nix
diff --git a/tests/lang/eval-okay-fromTOML.exp b/tests/functional/lang/eval-okay-fromTOML.exp
index d0dd3af2c..d0dd3af2c 100644
--- a/tests/lang/eval-okay-fromTOML.exp
+++ b/tests/functional/lang/eval-okay-fromTOML.exp
diff --git a/tests/lang/eval-okay-fromTOML.nix b/tests/functional/lang/eval-okay-fromTOML.nix
index 963932689..963932689 100644
--- a/tests/lang/eval-okay-fromTOML.nix
+++ b/tests/functional/lang/eval-okay-fromTOML.nix
diff --git a/tests/lang/eval-okay-fromjson-escapes.exp b/tests/functional/lang/eval-okay-fromjson-escapes.exp
index add5505a8..add5505a8 100644
--- a/tests/lang/eval-okay-fromjson-escapes.exp
+++ b/tests/functional/lang/eval-okay-fromjson-escapes.exp
diff --git a/tests/lang/eval-okay-fromjson-escapes.nix b/tests/functional/lang/eval-okay-fromjson-escapes.nix
index f00713507..f00713507 100644
--- a/tests/lang/eval-okay-fromjson-escapes.nix
+++ b/tests/functional/lang/eval-okay-fromjson-escapes.nix
diff --git a/tests/lang/eval-okay-fromjson.exp b/tests/functional/lang/eval-okay-fromjson.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-fromjson.exp
+++ b/tests/functional/lang/eval-okay-fromjson.exp
diff --git a/tests/lang/eval-okay-fromjson.nix b/tests/functional/lang/eval-okay-fromjson.nix
index 4c526b9ae..4c526b9ae 100644
--- a/tests/lang/eval-okay-fromjson.nix
+++ b/tests/functional/lang/eval-okay-fromjson.nix
diff --git a/tests/lang/eval-okay-functionargs.exp b/tests/functional/lang/eval-okay-functionargs.exp
index c1c9f8ffa..c1c9f8ffa 100644
--- a/tests/lang/eval-okay-functionargs.exp
+++ b/tests/functional/lang/eval-okay-functionargs.exp
diff --git a/tests/lang/eval-okay-functionargs.exp.xml b/tests/functional/lang/eval-okay-functionargs.exp.xml
index 651f54c36..651f54c36 100644
--- a/tests/lang/eval-okay-functionargs.exp.xml
+++ b/tests/functional/lang/eval-okay-functionargs.exp.xml
diff --git a/tests/lang/eval-okay-functionargs.nix b/tests/functional/lang/eval-okay-functionargs.nix
index 68dca62ee..68dca62ee 100644
--- a/tests/lang/eval-okay-functionargs.nix
+++ b/tests/functional/lang/eval-okay-functionargs.nix
diff --git a/tests/lang/eval-okay-getattrpos-functionargs.exp b/tests/functional/lang/eval-okay-getattrpos-functionargs.exp
index 7f9ac40e8..7f9ac40e8 100644
--- a/tests/lang/eval-okay-getattrpos-functionargs.exp
+++ b/tests/functional/lang/eval-okay-getattrpos-functionargs.exp
diff --git a/tests/lang/eval-okay-getattrpos-functionargs.nix b/tests/functional/lang/eval-okay-getattrpos-functionargs.nix
index 11d6bb0e3..11d6bb0e3 100644
--- a/tests/lang/eval-okay-getattrpos-functionargs.nix
+++ b/tests/functional/lang/eval-okay-getattrpos-functionargs.nix
diff --git a/tests/lang/eval-okay-getattrpos-undefined.exp b/tests/functional/lang/eval-okay-getattrpos-undefined.exp
index 19765bd50..19765bd50 100644
--- a/tests/lang/eval-okay-getattrpos-undefined.exp
+++ b/tests/functional/lang/eval-okay-getattrpos-undefined.exp
diff --git a/tests/lang/eval-okay-getattrpos-undefined.nix b/tests/functional/lang/eval-okay-getattrpos-undefined.nix
index 14dd38f77..14dd38f77 100644
--- a/tests/lang/eval-okay-getattrpos-undefined.nix
+++ b/tests/functional/lang/eval-okay-getattrpos-undefined.nix
diff --git a/tests/lang/eval-okay-getattrpos.exp b/tests/functional/lang/eval-okay-getattrpos.exp
index 469249bbc..469249bbc 100644
--- a/tests/lang/eval-okay-getattrpos.exp
+++ b/tests/functional/lang/eval-okay-getattrpos.exp
diff --git a/tests/lang/eval-okay-getattrpos.nix b/tests/functional/lang/eval-okay-getattrpos.nix
index ca6b07961..ca6b07961 100644
--- a/tests/lang/eval-okay-getattrpos.nix
+++ b/tests/functional/lang/eval-okay-getattrpos.nix
diff --git a/tests/lang/eval-okay-getenv.exp b/tests/functional/lang/eval-okay-getenv.exp
index 14e24d419..14e24d419 100644
--- a/tests/lang/eval-okay-getenv.exp
+++ b/tests/functional/lang/eval-okay-getenv.exp
diff --git a/tests/lang/eval-okay-getenv.nix b/tests/functional/lang/eval-okay-getenv.nix
index 4cfec5f55..4cfec5f55 100644
--- a/tests/lang/eval-okay-getenv.nix
+++ b/tests/functional/lang/eval-okay-getenv.nix
diff --git a/tests/lang/eval-okay-groupBy.exp b/tests/functional/lang/eval-okay-groupBy.exp
index bfca5652a..bfca5652a 100644
--- a/tests/lang/eval-okay-groupBy.exp
+++ b/tests/functional/lang/eval-okay-groupBy.exp
diff --git a/tests/lang/eval-okay-groupBy.nix b/tests/functional/lang/eval-okay-groupBy.nix
index 862d89dbd..862d89dbd 100644
--- a/tests/lang/eval-okay-groupBy.nix
+++ b/tests/functional/lang/eval-okay-groupBy.nix
diff --git a/tests/lang/eval-okay-hash.exp b/tests/functional/lang/eval-okay-hash.exp
index e69de29bb..e69de29bb 100644
--- a/tests/lang/eval-okay-hash.exp
+++ b/tests/functional/lang/eval-okay-hash.exp
diff --git a/tests/lang/eval-okay-hashfile.exp b/tests/functional/lang/eval-okay-hashfile.exp
index ff1e8293e..ff1e8293e 100644
--- a/tests/lang/eval-okay-hashfile.exp
+++ b/tests/functional/lang/eval-okay-hashfile.exp
diff --git a/tests/lang/eval-okay-hashfile.nix b/tests/functional/lang/eval-okay-hashfile.nix
index aff5a1856..aff5a1856 100644
--- a/tests/lang/eval-okay-hashfile.nix
+++ b/tests/functional/lang/eval-okay-hashfile.nix
diff --git a/tests/lang/eval-okay-hashstring.exp b/tests/functional/lang/eval-okay-hashstring.exp
index d720a082d..d720a082d 100644
--- a/tests/lang/eval-okay-hashstring.exp
+++ b/tests/functional/lang/eval-okay-hashstring.exp
diff --git a/tests/lang/eval-okay-hashstring.nix b/tests/functional/lang/eval-okay-hashstring.nix
index b0f62b245..b0f62b245 100644
--- a/tests/lang/eval-okay-hashstring.nix
+++ b/tests/functional/lang/eval-okay-hashstring.nix
diff --git a/tests/lang/eval-okay-if.exp b/tests/functional/lang/eval-okay-if.exp
index 00750edc0..00750edc0 100644
--- a/tests/lang/eval-okay-if.exp
+++ b/tests/functional/lang/eval-okay-if.exp
diff --git a/tests/lang/eval-okay-if.nix b/tests/functional/lang/eval-okay-if.nix
index 23e4c74d5..23e4c74d5 100644
--- a/tests/lang/eval-okay-if.nix
+++ b/tests/functional/lang/eval-okay-if.nix
diff --git a/tests/lang/eval-okay-import.exp b/tests/functional/lang/eval-okay-import.exp
index c508125b5..c508125b5 100644
--- a/tests/lang/eval-okay-import.exp
+++ b/tests/functional/lang/eval-okay-import.exp
diff --git a/tests/lang/eval-okay-import.nix b/tests/functional/lang/eval-okay-import.nix
index 0b18d9413..0b18d9413 100644
--- a/tests/lang/eval-okay-import.nix
+++ b/tests/functional/lang/eval-okay-import.nix
diff --git a/tests/lang/eval-okay-ind-string.exp b/tests/functional/lang/eval-okay-ind-string.exp
index 7862331fa..7862331fa 100644
--- a/tests/lang/eval-okay-ind-string.exp
+++ b/tests/functional/lang/eval-okay-ind-string.exp
diff --git a/tests/lang/eval-okay-ind-string.nix b/tests/functional/lang/eval-okay-ind-string.nix
index 95d59b508..95d59b508 100644
--- a/tests/lang/eval-okay-ind-string.nix
+++ b/tests/functional/lang/eval-okay-ind-string.nix
diff --git a/tests/lang/eval-okay-intersectAttrs.exp b/tests/functional/lang/eval-okay-intersectAttrs.exp
index 50445bc0e..50445bc0e 100644
--- a/tests/lang/eval-okay-intersectAttrs.exp
+++ b/tests/functional/lang/eval-okay-intersectAttrs.exp
diff --git a/tests/lang/eval-okay-intersectAttrs.nix b/tests/functional/lang/eval-okay-intersectAttrs.nix
index 39d49938c..39d49938c 100644
--- a/tests/lang/eval-okay-intersectAttrs.nix
+++ b/tests/functional/lang/eval-okay-intersectAttrs.nix
diff --git a/tests/lang/eval-okay-let.exp b/tests/functional/lang/eval-okay-let.exp
index 14e24d419..14e24d419 100644
--- a/tests/lang/eval-okay-let.exp
+++ b/tests/functional/lang/eval-okay-let.exp
diff --git a/tests/lang/eval-okay-let.nix b/tests/functional/lang/eval-okay-let.nix
index fe118c528..fe118c528 100644
--- a/tests/lang/eval-okay-let.nix
+++ b/tests/functional/lang/eval-okay-let.nix
diff --git a/tests/lang/eval-okay-list.exp b/tests/functional/lang/eval-okay-list.exp
index f784f26d8..f784f26d8 100644
--- a/tests/lang/eval-okay-list.exp
+++ b/tests/functional/lang/eval-okay-list.exp
diff --git a/tests/lang/eval-okay-list.nix b/tests/functional/lang/eval-okay-list.nix
index d433bcf90..d433bcf90 100644
--- a/tests/lang/eval-okay-list.nix
+++ b/tests/functional/lang/eval-okay-list.nix
diff --git a/tests/lang/eval-okay-listtoattrs.exp b/tests/functional/lang/eval-okay-listtoattrs.exp
index 74abef7bc..74abef7bc 100644
--- a/tests/lang/eval-okay-listtoattrs.exp
+++ b/tests/functional/lang/eval-okay-listtoattrs.exp
diff --git a/tests/lang/eval-okay-listtoattrs.nix b/tests/functional/lang/eval-okay-listtoattrs.nix
index 4186e029b..4186e029b 100644
--- a/tests/lang/eval-okay-listtoattrs.nix
+++ b/tests/functional/lang/eval-okay-listtoattrs.nix
diff --git a/tests/lang/eval-okay-logic.exp b/tests/functional/lang/eval-okay-logic.exp
index d00491fd7..d00491fd7 100644
--- a/tests/lang/eval-okay-logic.exp
+++ b/tests/functional/lang/eval-okay-logic.exp
diff --git a/tests/lang/eval-okay-logic.nix b/tests/functional/lang/eval-okay-logic.nix
index fbb127944..fbb127944 100644
--- a/tests/lang/eval-okay-logic.nix
+++ b/tests/functional/lang/eval-okay-logic.nix
diff --git a/tests/lang/eval-okay-map.exp b/tests/functional/lang/eval-okay-map.exp
index dbb64f717..dbb64f717 100644
--- a/tests/lang/eval-okay-map.exp
+++ b/tests/functional/lang/eval-okay-map.exp
diff --git a/tests/lang/eval-okay-map.nix b/tests/functional/lang/eval-okay-map.nix
index a76c1d811..a76c1d811 100644
--- a/tests/lang/eval-okay-map.nix
+++ b/tests/functional/lang/eval-okay-map.nix
diff --git a/tests/lang/eval-okay-mapattrs.exp b/tests/functional/lang/eval-okay-mapattrs.exp
index 3f113f17b..3f113f17b 100644
--- a/tests/lang/eval-okay-mapattrs.exp
+++ b/tests/functional/lang/eval-okay-mapattrs.exp
diff --git a/tests/lang/eval-okay-mapattrs.nix b/tests/functional/lang/eval-okay-mapattrs.nix
index f075b6275..f075b6275 100644
--- a/tests/lang/eval-okay-mapattrs.nix
+++ b/tests/functional/lang/eval-okay-mapattrs.nix
diff --git a/tests/lang/eval-okay-merge-dynamic-attrs.exp b/tests/functional/lang/eval-okay-merge-dynamic-attrs.exp
index 157d677ce..157d677ce 100644
--- a/tests/lang/eval-okay-merge-dynamic-attrs.exp
+++ b/tests/functional/lang/eval-okay-merge-dynamic-attrs.exp
diff --git a/tests/lang/eval-okay-merge-dynamic-attrs.nix b/tests/functional/lang/eval-okay-merge-dynamic-attrs.nix
index f459a554f..f459a554f 100644
--- a/tests/lang/eval-okay-merge-dynamic-attrs.nix
+++ b/tests/functional/lang/eval-okay-merge-dynamic-attrs.nix
diff --git a/tests/lang/eval-okay-nested-with.exp b/tests/functional/lang/eval-okay-nested-with.exp
index 0cfbf0888..0cfbf0888 100644
--- a/tests/lang/eval-okay-nested-with.exp
+++ b/tests/functional/lang/eval-okay-nested-with.exp
diff --git a/tests/lang/eval-okay-nested-with.nix b/tests/functional/lang/eval-okay-nested-with.nix
index ba9d79aa7..ba9d79aa7 100644
--- a/tests/lang/eval-okay-nested-with.nix
+++ b/tests/functional/lang/eval-okay-nested-with.nix
diff --git a/tests/lang/eval-okay-new-let.exp b/tests/functional/lang/eval-okay-new-let.exp
index f98b38807..f98b38807 100644
--- a/tests/lang/eval-okay-new-let.exp
+++ b/tests/functional/lang/eval-okay-new-let.exp
diff --git a/tests/lang/eval-okay-new-let.nix b/tests/functional/lang/eval-okay-new-let.nix
index 738123141..738123141 100644
--- a/tests/lang/eval-okay-new-let.nix
+++ b/tests/functional/lang/eval-okay-new-let.nix
diff --git a/tests/lang/eval-okay-null-dynamic-attrs.exp b/tests/functional/lang/eval-okay-null-dynamic-attrs.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-null-dynamic-attrs.exp
+++ b/tests/functional/lang/eval-okay-null-dynamic-attrs.exp
diff --git a/tests/lang/eval-okay-null-dynamic-attrs.nix b/tests/functional/lang/eval-okay-null-dynamic-attrs.nix
index b060c0bc9..b060c0bc9 100644
--- a/tests/lang/eval-okay-null-dynamic-attrs.nix
+++ b/tests/functional/lang/eval-okay-null-dynamic-attrs.nix
diff --git a/tests/lang/eval-okay-overrides.exp b/tests/functional/lang/eval-okay-overrides.exp
index 0cfbf0888..0cfbf0888 100644
--- a/tests/lang/eval-okay-overrides.exp
+++ b/tests/functional/lang/eval-okay-overrides.exp
diff --git a/tests/lang/eval-okay-overrides.nix b/tests/functional/lang/eval-okay-overrides.nix
index 719bdc9c0..719bdc9c0 100644
--- a/tests/lang/eval-okay-overrides.nix
+++ b/tests/functional/lang/eval-okay-overrides.nix
diff --git a/tests/lang/eval-okay-parse-flake-ref.exp b/tests/functional/lang/eval-okay-parse-flake-ref.exp
index fc17ba085..fc17ba085 100644
--- a/tests/lang/eval-okay-parse-flake-ref.exp
+++ b/tests/functional/lang/eval-okay-parse-flake-ref.exp
diff --git a/tests/lang/eval-okay-parse-flake-ref.nix b/tests/functional/lang/eval-okay-parse-flake-ref.nix
index db4ed2742..db4ed2742 100644
--- a/tests/lang/eval-okay-parse-flake-ref.nix
+++ b/tests/functional/lang/eval-okay-parse-flake-ref.nix
diff --git a/tests/lang/eval-okay-partition.exp b/tests/functional/lang/eval-okay-partition.exp
index cd8b8b020..cd8b8b020 100644
--- a/tests/lang/eval-okay-partition.exp
+++ b/tests/functional/lang/eval-okay-partition.exp
diff --git a/tests/lang/eval-okay-partition.nix b/tests/functional/lang/eval-okay-partition.nix
index 846d2ce49..846d2ce49 100644
--- a/tests/lang/eval-okay-partition.nix
+++ b/tests/functional/lang/eval-okay-partition.nix
diff --git a/tests/lang/eval-okay-path-string-interpolation.exp b/tests/functional/lang/eval-okay-path-string-interpolation.exp
index 5b8ea0243..5b8ea0243 100644
--- a/tests/lang/eval-okay-path-string-interpolation.exp
+++ b/tests/functional/lang/eval-okay-path-string-interpolation.exp
diff --git a/tests/lang/eval-okay-path-string-interpolation.nix b/tests/functional/lang/eval-okay-path-string-interpolation.nix
index 497d7c1c7..497d7c1c7 100644
--- a/tests/lang/eval-okay-path-string-interpolation.nix
+++ b/tests/functional/lang/eval-okay-path-string-interpolation.nix
diff --git a/tests/lang/eval-okay-path.exp b/tests/functional/lang/eval-okay-path.exp
index 3ce7f8283..3ce7f8283 100644
--- a/tests/lang/eval-okay-path.exp
+++ b/tests/functional/lang/eval-okay-path.exp
diff --git a/tests/lang/eval-okay-path.nix b/tests/functional/lang/eval-okay-path.nix
index e67168cf3..e67168cf3 100644
--- a/tests/lang/eval-okay-path.nix
+++ b/tests/functional/lang/eval-okay-path.nix
diff --git a/tests/lang/eval-okay-pathexists.exp b/tests/functional/lang/eval-okay-pathexists.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-pathexists.exp
+++ b/tests/functional/lang/eval-okay-pathexists.exp
diff --git a/tests/lang/eval-okay-pathexists.nix b/tests/functional/lang/eval-okay-pathexists.nix
index c5e7a62de..c5e7a62de 100644
--- a/tests/lang/eval-okay-pathexists.nix
+++ b/tests/functional/lang/eval-okay-pathexists.nix
diff --git a/tests/lang/eval-okay-patterns.exp b/tests/functional/lang/eval-okay-patterns.exp
index a4304010f..a4304010f 100644
--- a/tests/lang/eval-okay-patterns.exp
+++ b/tests/functional/lang/eval-okay-patterns.exp
diff --git a/tests/lang/eval-okay-patterns.nix b/tests/functional/lang/eval-okay-patterns.nix
index 96fd25a01..96fd25a01 100644
--- a/tests/lang/eval-okay-patterns.nix
+++ b/tests/functional/lang/eval-okay-patterns.nix
diff --git a/tests/lang/eval-okay-print.err.exp b/tests/functional/lang/eval-okay-print.err.exp
index 3fc99be3e..3fc99be3e 100644
--- a/tests/lang/eval-okay-print.err.exp
+++ b/tests/functional/lang/eval-okay-print.err.exp
diff --git a/tests/lang/eval-okay-print.exp b/tests/functional/lang/eval-okay-print.exp
index 0d960fb70..0d960fb70 100644
--- a/tests/lang/eval-okay-print.exp
+++ b/tests/functional/lang/eval-okay-print.exp
diff --git a/tests/lang/eval-okay-print.nix b/tests/functional/lang/eval-okay-print.nix
index d36ba4da3..d36ba4da3 100644
--- a/tests/lang/eval-okay-print.nix
+++ b/tests/functional/lang/eval-okay-print.nix
diff --git a/tests/lang/eval-okay-readDir.exp b/tests/functional/lang/eval-okay-readDir.exp
index 6413f6d4f..6413f6d4f 100644
--- a/tests/lang/eval-okay-readDir.exp
+++ b/tests/functional/lang/eval-okay-readDir.exp
diff --git a/tests/lang/eval-okay-readDir.nix b/tests/functional/lang/eval-okay-readDir.nix
index a7ec9292a..a7ec9292a 100644
--- a/tests/lang/eval-okay-readDir.nix
+++ b/tests/functional/lang/eval-okay-readDir.nix
diff --git a/tests/lang/eval-okay-readFileType.exp b/tests/functional/lang/eval-okay-readFileType.exp
index 6413f6d4f..6413f6d4f 100644
--- a/tests/lang/eval-okay-readFileType.exp
+++ b/tests/functional/lang/eval-okay-readFileType.exp
diff --git a/tests/lang/eval-okay-readFileType.nix b/tests/functional/lang/eval-okay-readFileType.nix
index 174fb6c3a..174fb6c3a 100644
--- a/tests/lang/eval-okay-readFileType.nix
+++ b/tests/functional/lang/eval-okay-readFileType.nix
diff --git a/tests/lang/eval-okay-readfile.exp b/tests/functional/lang/eval-okay-readfile.exp
index a2c87d0c4..a2c87d0c4 100644
--- a/tests/lang/eval-okay-readfile.exp
+++ b/tests/functional/lang/eval-okay-readfile.exp
diff --git a/tests/lang/eval-okay-readfile.nix b/tests/functional/lang/eval-okay-readfile.nix
index 82f7cb174..82f7cb174 100644
--- a/tests/lang/eval-okay-readfile.nix
+++ b/tests/functional/lang/eval-okay-readfile.nix
diff --git a/tests/lang/eval-okay-redefine-builtin.exp b/tests/functional/lang/eval-okay-redefine-builtin.exp
index c508d5366..c508d5366 100644
--- a/tests/lang/eval-okay-redefine-builtin.exp
+++ b/tests/functional/lang/eval-okay-redefine-builtin.exp
diff --git a/tests/lang/eval-okay-redefine-builtin.nix b/tests/functional/lang/eval-okay-redefine-builtin.nix
index df9fc3f37..df9fc3f37 100644
--- a/tests/lang/eval-okay-redefine-builtin.nix
+++ b/tests/functional/lang/eval-okay-redefine-builtin.nix
diff --git a/tests/lang/eval-okay-regex-match.exp b/tests/functional/lang/eval-okay-regex-match.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-regex-match.exp
+++ b/tests/functional/lang/eval-okay-regex-match.exp
diff --git a/tests/lang/eval-okay-regex-match.nix b/tests/functional/lang/eval-okay-regex-match.nix
index 273e25907..273e25907 100644
--- a/tests/lang/eval-okay-regex-match.nix
+++ b/tests/functional/lang/eval-okay-regex-match.nix
diff --git a/tests/lang/eval-okay-regex-split.exp b/tests/functional/lang/eval-okay-regex-split.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-regex-split.exp
+++ b/tests/functional/lang/eval-okay-regex-split.exp
diff --git a/tests/lang/eval-okay-regex-split.nix b/tests/functional/lang/eval-okay-regex-split.nix
index 0073e0577..0073e0577 100644
--- a/tests/lang/eval-okay-regex-split.nix
+++ b/tests/functional/lang/eval-okay-regex-split.nix
diff --git a/tests/lang/eval-okay-regression-20220122.exp b/tests/functional/lang/eval-okay-regression-20220122.exp
index 00750edc0..00750edc0 100644
--- a/tests/lang/eval-okay-regression-20220122.exp
+++ b/tests/functional/lang/eval-okay-regression-20220122.exp
diff --git a/tests/lang/eval-okay-regression-20220122.nix b/tests/functional/lang/eval-okay-regression-20220122.nix
index 694e9a13b..694e9a13b 100644
--- a/tests/lang/eval-okay-regression-20220122.nix
+++ b/tests/functional/lang/eval-okay-regression-20220122.nix
diff --git a/tests/lang/eval-okay-regression-20220125.exp b/tests/functional/lang/eval-okay-regression-20220125.exp
index 00750edc0..00750edc0 100644
--- a/tests/lang/eval-okay-regression-20220125.exp
+++ b/tests/functional/lang/eval-okay-regression-20220125.exp
diff --git a/tests/lang/eval-okay-regression-20220125.nix b/tests/functional/lang/eval-okay-regression-20220125.nix
index 485502373..485502373 100644
--- a/tests/lang/eval-okay-regression-20220125.nix
+++ b/tests/functional/lang/eval-okay-regression-20220125.nix
diff --git a/tests/lang/eval-okay-remove.exp b/tests/functional/lang/eval-okay-remove.exp
index 8d38505c1..8d38505c1 100644
--- a/tests/lang/eval-okay-remove.exp
+++ b/tests/functional/lang/eval-okay-remove.exp
diff --git a/tests/lang/eval-okay-remove.nix b/tests/functional/lang/eval-okay-remove.nix
index 4ad5ba897..4ad5ba897 100644
--- a/tests/lang/eval-okay-remove.nix
+++ b/tests/functional/lang/eval-okay-remove.nix
diff --git a/tests/lang/eval-okay-replacestrings.exp b/tests/functional/lang/eval-okay-replacestrings.exp
index eac67c5fe..eac67c5fe 100644
--- a/tests/lang/eval-okay-replacestrings.exp
+++ b/tests/functional/lang/eval-okay-replacestrings.exp
diff --git a/tests/lang/eval-okay-replacestrings.nix b/tests/functional/lang/eval-okay-replacestrings.nix
index a803e6519..a803e6519 100644
--- a/tests/lang/eval-okay-replacestrings.nix
+++ b/tests/functional/lang/eval-okay-replacestrings.nix
diff --git a/tests/lang/eval-okay-scope-1.exp b/tests/functional/lang/eval-okay-scope-1.exp
index 00750edc0..00750edc0 100644
--- a/tests/lang/eval-okay-scope-1.exp
+++ b/tests/functional/lang/eval-okay-scope-1.exp
diff --git a/tests/lang/eval-okay-scope-1.nix b/tests/functional/lang/eval-okay-scope-1.nix
index fa38a7174..fa38a7174 100644
--- a/tests/lang/eval-okay-scope-1.nix
+++ b/tests/functional/lang/eval-okay-scope-1.nix
diff --git a/tests/lang/eval-okay-scope-2.exp b/tests/functional/lang/eval-okay-scope-2.exp
index d00491fd7..d00491fd7 100644
--- a/tests/lang/eval-okay-scope-2.exp
+++ b/tests/functional/lang/eval-okay-scope-2.exp
diff --git a/tests/lang/eval-okay-scope-2.nix b/tests/functional/lang/eval-okay-scope-2.nix
index eb8b02bc4..eb8b02bc4 100644
--- a/tests/lang/eval-okay-scope-2.nix
+++ b/tests/functional/lang/eval-okay-scope-2.nix
diff --git a/tests/lang/eval-okay-scope-3.exp b/tests/functional/lang/eval-okay-scope-3.exp
index b8626c4cf..b8626c4cf 100644
--- a/tests/lang/eval-okay-scope-3.exp
+++ b/tests/functional/lang/eval-okay-scope-3.exp
diff --git a/tests/lang/eval-okay-scope-3.nix b/tests/functional/lang/eval-okay-scope-3.nix
index 10d6bc04d..10d6bc04d 100644
--- a/tests/lang/eval-okay-scope-3.nix
+++ b/tests/functional/lang/eval-okay-scope-3.nix
diff --git a/tests/lang/eval-okay-scope-4.exp b/tests/functional/lang/eval-okay-scope-4.exp
index 00ff03a46..00ff03a46 100644
--- a/tests/lang/eval-okay-scope-4.exp
+++ b/tests/functional/lang/eval-okay-scope-4.exp
diff --git a/tests/lang/eval-okay-scope-4.nix b/tests/functional/lang/eval-okay-scope-4.nix
index dc8243bc8..dc8243bc8 100644
--- a/tests/lang/eval-okay-scope-4.nix
+++ b/tests/functional/lang/eval-okay-scope-4.nix
diff --git a/tests/lang/eval-okay-scope-6.exp b/tests/functional/lang/eval-okay-scope-6.exp
index 00ff03a46..00ff03a46 100644
--- a/tests/lang/eval-okay-scope-6.exp
+++ b/tests/functional/lang/eval-okay-scope-6.exp
diff --git a/tests/lang/eval-okay-scope-6.nix b/tests/functional/lang/eval-okay-scope-6.nix
index 0995d4e7e..0995d4e7e 100644
--- a/tests/lang/eval-okay-scope-6.nix
+++ b/tests/functional/lang/eval-okay-scope-6.nix
diff --git a/tests/lang/eval-okay-scope-7.exp b/tests/functional/lang/eval-okay-scope-7.exp
index d00491fd7..d00491fd7 100644
--- a/tests/lang/eval-okay-scope-7.exp
+++ b/tests/functional/lang/eval-okay-scope-7.exp
diff --git a/tests/lang/eval-okay-scope-7.nix b/tests/functional/lang/eval-okay-scope-7.nix
index 4da02968f..4da02968f 100644
--- a/tests/lang/eval-okay-scope-7.nix
+++ b/tests/functional/lang/eval-okay-scope-7.nix
diff --git a/tests/lang/eval-okay-search-path.exp b/tests/functional/lang/eval-okay-search-path.exp
index 4519bc406..4519bc406 100644
--- a/tests/lang/eval-okay-search-path.exp
+++ b/tests/functional/lang/eval-okay-search-path.exp
diff --git a/tests/lang/eval-okay-search-path.flags b/tests/functional/lang/eval-okay-search-path.flags
index dfad1c611..dfad1c611 100644
--- a/tests/lang/eval-okay-search-path.flags
+++ b/tests/functional/lang/eval-okay-search-path.flags
diff --git a/tests/lang/eval-okay-search-path.nix b/tests/functional/lang/eval-okay-search-path.nix
index 6fe33decc..6fe33decc 100644
--- a/tests/lang/eval-okay-search-path.nix
+++ b/tests/functional/lang/eval-okay-search-path.nix
diff --git a/tests/lang/eval-okay-seq.exp b/tests/functional/lang/eval-okay-seq.exp
index 0cfbf0888..0cfbf0888 100644
--- a/tests/lang/eval-okay-seq.exp
+++ b/tests/functional/lang/eval-okay-seq.exp
diff --git a/tests/lang/eval-okay-seq.nix b/tests/functional/lang/eval-okay-seq.nix
index 0a9a21c03..0a9a21c03 100644
--- a/tests/lang/eval-okay-seq.nix
+++ b/tests/functional/lang/eval-okay-seq.nix
diff --git a/tests/lang/eval-okay-sort.exp b/tests/functional/lang/eval-okay-sort.exp
index 899119e20..899119e20 100644
--- a/tests/lang/eval-okay-sort.exp
+++ b/tests/functional/lang/eval-okay-sort.exp
diff --git a/tests/lang/eval-okay-sort.nix b/tests/functional/lang/eval-okay-sort.nix
index 50aa78e40..50aa78e40 100644
--- a/tests/lang/eval-okay-sort.nix
+++ b/tests/functional/lang/eval-okay-sort.nix
diff --git a/tests/lang/eval-okay-splitversion.exp b/tests/functional/lang/eval-okay-splitversion.exp
index 153ceb818..153ceb818 100644
--- a/tests/lang/eval-okay-splitversion.exp
+++ b/tests/functional/lang/eval-okay-splitversion.exp
diff --git a/tests/lang/eval-okay-splitversion.nix b/tests/functional/lang/eval-okay-splitversion.nix
index 9e5c99d2e..9e5c99d2e 100644
--- a/tests/lang/eval-okay-splitversion.nix
+++ b/tests/functional/lang/eval-okay-splitversion.nix
diff --git a/tests/lang/eval-okay-string.exp b/tests/functional/lang/eval-okay-string.exp
index 63f650f73..63f650f73 100644
--- a/tests/lang/eval-okay-string.exp
+++ b/tests/functional/lang/eval-okay-string.exp
diff --git a/tests/lang/eval-okay-string.nix b/tests/functional/lang/eval-okay-string.nix
index 47cc989ad..47cc989ad 100644
--- a/tests/lang/eval-okay-string.nix
+++ b/tests/functional/lang/eval-okay-string.nix
diff --git a/tests/lang/eval-okay-strings-as-attrs-names.exp b/tests/functional/lang/eval-okay-strings-as-attrs-names.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-strings-as-attrs-names.exp
+++ b/tests/functional/lang/eval-okay-strings-as-attrs-names.exp
diff --git a/tests/lang/eval-okay-strings-as-attrs-names.nix b/tests/functional/lang/eval-okay-strings-as-attrs-names.nix
index 5e40928db..5e40928db 100644
--- a/tests/lang/eval-okay-strings-as-attrs-names.nix
+++ b/tests/functional/lang/eval-okay-strings-as-attrs-names.nix
diff --git a/tests/lang/eval-okay-substring.exp b/tests/functional/lang/eval-okay-substring.exp
index 6aace04b0..6aace04b0 100644
--- a/tests/lang/eval-okay-substring.exp
+++ b/tests/functional/lang/eval-okay-substring.exp
diff --git a/tests/lang/eval-okay-substring.nix b/tests/functional/lang/eval-okay-substring.nix
index 424af00d9..424af00d9 100644
--- a/tests/lang/eval-okay-substring.nix
+++ b/tests/functional/lang/eval-okay-substring.nix
diff --git a/tests/lang/eval-okay-tail-call-1.exp-disabled b/tests/functional/lang/eval-okay-tail-call-1.exp-disabled
index f7393e847..f7393e847 100644
--- a/tests/lang/eval-okay-tail-call-1.exp-disabled
+++ b/tests/functional/lang/eval-okay-tail-call-1.exp-disabled
diff --git a/tests/lang/eval-okay-tail-call-1.nix b/tests/functional/lang/eval-okay-tail-call-1.nix
index a3962ce3f..a3962ce3f 100644
--- a/tests/lang/eval-okay-tail-call-1.nix
+++ b/tests/functional/lang/eval-okay-tail-call-1.nix
diff --git a/tests/lang/eval-okay-tojson.exp b/tests/functional/lang/eval-okay-tojson.exp
index e92aae323..e92aae323 100644
--- a/tests/lang/eval-okay-tojson.exp
+++ b/tests/functional/lang/eval-okay-tojson.exp
diff --git a/tests/lang/eval-okay-tojson.nix b/tests/functional/lang/eval-okay-tojson.nix
index ce67943be..ce67943be 100644
--- a/tests/lang/eval-okay-tojson.nix
+++ b/tests/functional/lang/eval-okay-tojson.nix
diff --git a/tests/lang/eval-okay-toxml.exp b/tests/functional/lang/eval-okay-toxml.exp
index 828220890..828220890 100644
--- a/tests/lang/eval-okay-toxml.exp
+++ b/tests/functional/lang/eval-okay-toxml.exp
diff --git a/tests/lang/eval-okay-toxml.nix b/tests/functional/lang/eval-okay-toxml.nix
index 068c97a6c..068c97a6c 100644
--- a/tests/lang/eval-okay-toxml.nix
+++ b/tests/functional/lang/eval-okay-toxml.nix
diff --git a/tests/lang/eval-okay-toxml2.exp b/tests/functional/lang/eval-okay-toxml2.exp
index 634a841eb..634a841eb 100644
--- a/tests/lang/eval-okay-toxml2.exp
+++ b/tests/functional/lang/eval-okay-toxml2.exp
diff --git a/tests/lang/eval-okay-toxml2.nix b/tests/functional/lang/eval-okay-toxml2.nix
index ff1791b30..ff1791b30 100644
--- a/tests/lang/eval-okay-toxml2.nix
+++ b/tests/functional/lang/eval-okay-toxml2.nix
diff --git a/tests/lang/eval-okay-tryeval.exp b/tests/functional/lang/eval-okay-tryeval.exp
index 2b2e6fa71..2b2e6fa71 100644
--- a/tests/lang/eval-okay-tryeval.exp
+++ b/tests/functional/lang/eval-okay-tryeval.exp
diff --git a/tests/lang/eval-okay-tryeval.nix b/tests/functional/lang/eval-okay-tryeval.nix
index 629bc440a..629bc440a 100644
--- a/tests/lang/eval-okay-tryeval.nix
+++ b/tests/functional/lang/eval-okay-tryeval.nix
diff --git a/tests/lang/eval-okay-types.exp b/tests/functional/lang/eval-okay-types.exp
index 92a153299..92a153299 100644
--- a/tests/lang/eval-okay-types.exp
+++ b/tests/functional/lang/eval-okay-types.exp
diff --git a/tests/lang/eval-okay-types.nix b/tests/functional/lang/eval-okay-types.nix
index 9b58be5d1..9b58be5d1 100644
--- a/tests/lang/eval-okay-types.nix
+++ b/tests/functional/lang/eval-okay-types.nix
diff --git a/tests/lang/eval-okay-versions.exp b/tests/functional/lang/eval-okay-versions.exp
index 27ba77dda..27ba77dda 100644
--- a/tests/lang/eval-okay-versions.exp
+++ b/tests/functional/lang/eval-okay-versions.exp
diff --git a/tests/lang/eval-okay-versions.nix b/tests/functional/lang/eval-okay-versions.nix
index e9111f5f4..e9111f5f4 100644
--- a/tests/lang/eval-okay-versions.nix
+++ b/tests/functional/lang/eval-okay-versions.nix
diff --git a/tests/lang/eval-okay-with.exp b/tests/functional/lang/eval-okay-with.exp
index 378c8dc80..378c8dc80 100644
--- a/tests/lang/eval-okay-with.exp
+++ b/tests/functional/lang/eval-okay-with.exp
diff --git a/tests/lang/eval-okay-with.nix b/tests/functional/lang/eval-okay-with.nix
index 033e8d3ab..033e8d3ab 100644
--- a/tests/lang/eval-okay-with.nix
+++ b/tests/functional/lang/eval-okay-with.nix
diff --git a/tests/lang/eval-okay-xml.exp.xml b/tests/functional/lang/eval-okay-xml.exp.xml
index 20099326c..20099326c 100644
--- a/tests/lang/eval-okay-xml.exp.xml
+++ b/tests/functional/lang/eval-okay-xml.exp.xml
diff --git a/tests/lang/eval-okay-xml.nix b/tests/functional/lang/eval-okay-xml.nix
index 9ee9f8a0b..9ee9f8a0b 100644
--- a/tests/lang/eval-okay-xml.nix
+++ b/tests/functional/lang/eval-okay-xml.nix
diff --git a/tests/lang/eval-okay-zipAttrsWith.exp b/tests/functional/lang/eval-okay-zipAttrsWith.exp
index 9c0b15d22..9c0b15d22 100644
--- a/tests/lang/eval-okay-zipAttrsWith.exp
+++ b/tests/functional/lang/eval-okay-zipAttrsWith.exp
diff --git a/tests/lang/eval-okay-zipAttrsWith.nix b/tests/functional/lang/eval-okay-zipAttrsWith.nix
index 877d4e5fa..877d4e5fa 100644
--- a/tests/lang/eval-okay-zipAttrsWith.nix
+++ b/tests/functional/lang/eval-okay-zipAttrsWith.nix
diff --git a/tests/lang/framework.sh b/tests/functional/lang/framework.sh
index 516bff8ad..516bff8ad 100644
--- a/tests/lang/framework.sh
+++ b/tests/functional/lang/framework.sh
diff --git a/tests/lang/imported.nix b/tests/functional/lang/imported.nix
index fb39ee4ef..fb39ee4ef 100644
--- a/tests/lang/imported.nix
+++ b/tests/functional/lang/imported.nix
diff --git a/tests/lang/imported2.nix b/tests/functional/lang/imported2.nix
index 6d0a2992b..6d0a2992b 100644
--- a/tests/lang/imported2.nix
+++ b/tests/functional/lang/imported2.nix
diff --git a/tests/lang/lib.nix b/tests/functional/lang/lib.nix
index 028a53831..028a53831 100644
--- a/tests/lang/lib.nix
+++ b/tests/functional/lang/lib.nix
diff --git a/tests/lang/parse-fail-dup-attrs-1.err.exp b/tests/functional/lang/parse-fail-dup-attrs-1.err.exp
index 4fe6b7a1f..4fe6b7a1f 100644
--- a/tests/lang/parse-fail-dup-attrs-1.err.exp
+++ b/tests/functional/lang/parse-fail-dup-attrs-1.err.exp
diff --git a/tests/lang/parse-fail-dup-attrs-1.nix b/tests/functional/lang/parse-fail-dup-attrs-1.nix
index 2c02317d2..2c02317d2 100644
--- a/tests/lang/parse-fail-dup-attrs-1.nix
+++ b/tests/functional/lang/parse-fail-dup-attrs-1.nix
diff --git a/tests/lang/parse-fail-dup-attrs-2.err.exp b/tests/functional/lang/parse-fail-dup-attrs-2.err.exp
index 3aba2891f..3aba2891f 100644
--- a/tests/lang/parse-fail-dup-attrs-2.err.exp
+++ b/tests/functional/lang/parse-fail-dup-attrs-2.err.exp
diff --git a/tests/lang/parse-fail-dup-attrs-2.nix b/tests/functional/lang/parse-fail-dup-attrs-2.nix
index 864d9865e..864d9865e 100644
--- a/tests/lang/parse-fail-dup-attrs-2.nix
+++ b/tests/functional/lang/parse-fail-dup-attrs-2.nix
diff --git a/tests/lang/parse-fail-dup-attrs-3.err.exp b/tests/functional/lang/parse-fail-dup-attrs-3.err.exp
index 3aba2891f..3aba2891f 100644
--- a/tests/lang/parse-fail-dup-attrs-3.err.exp
+++ b/tests/functional/lang/parse-fail-dup-attrs-3.err.exp
diff --git a/tests/lang/parse-fail-dup-attrs-3.nix b/tests/functional/lang/parse-fail-dup-attrs-3.nix
index 114d19779..114d19779 100644
--- a/tests/lang/parse-fail-dup-attrs-3.nix
+++ b/tests/functional/lang/parse-fail-dup-attrs-3.nix
diff --git a/tests/lang/parse-fail-dup-attrs-4.err.exp b/tests/functional/lang/parse-fail-dup-attrs-4.err.exp
index ff68446a1..ff68446a1 100644
--- a/tests/lang/parse-fail-dup-attrs-4.err.exp
+++ b/tests/functional/lang/parse-fail-dup-attrs-4.err.exp
diff --git a/tests/lang/parse-fail-dup-attrs-4.nix b/tests/functional/lang/parse-fail-dup-attrs-4.nix
index 77417432b..77417432b 100644
--- a/tests/lang/parse-fail-dup-attrs-4.nix
+++ b/tests/functional/lang/parse-fail-dup-attrs-4.nix
diff --git a/tests/lang/parse-fail-dup-attrs-6.err.exp b/tests/functional/lang/parse-fail-dup-attrs-6.err.exp
index 74823fc25..74823fc25 100644
--- a/tests/lang/parse-fail-dup-attrs-6.err.exp
+++ b/tests/functional/lang/parse-fail-dup-attrs-6.err.exp
diff --git a/tests/lang/parse-fail-dup-attrs-7.err.exp b/tests/functional/lang/parse-fail-dup-attrs-7.err.exp
index 512a499ca..512a499ca 100644
--- a/tests/lang/parse-fail-dup-attrs-7.err.exp
+++ b/tests/functional/lang/parse-fail-dup-attrs-7.err.exp
diff --git a/tests/lang/parse-fail-dup-attrs-7.nix b/tests/functional/lang/parse-fail-dup-attrs-7.nix
index bbc3eb08c..bbc3eb08c 100644
--- a/tests/lang/parse-fail-dup-attrs-7.nix
+++ b/tests/functional/lang/parse-fail-dup-attrs-7.nix
diff --git a/tests/lang/parse-fail-dup-formals.err.exp b/tests/functional/lang/parse-fail-dup-formals.err.exp
index 1d566fb33..1d566fb33 100644
--- a/tests/lang/parse-fail-dup-formals.err.exp
+++ b/tests/functional/lang/parse-fail-dup-formals.err.exp
diff --git a/tests/lang/parse-fail-dup-formals.nix b/tests/functional/lang/parse-fail-dup-formals.nix
index a0edd91a9..a0edd91a9 100644
--- a/tests/lang/parse-fail-dup-formals.nix
+++ b/tests/functional/lang/parse-fail-dup-formals.nix
diff --git a/tests/lang/parse-fail-eof-in-string.err.exp b/tests/functional/lang/parse-fail-eof-in-string.err.exp
index f9fa72312..f9fa72312 100644
--- a/tests/lang/parse-fail-eof-in-string.err.exp
+++ b/tests/functional/lang/parse-fail-eof-in-string.err.exp
diff --git a/tests/lang/parse-fail-eof-in-string.nix b/tests/functional/lang/parse-fail-eof-in-string.nix
index 19775d2ec..19775d2ec 100644
--- a/tests/lang/parse-fail-eof-in-string.nix
+++ b/tests/functional/lang/parse-fail-eof-in-string.nix
diff --git a/tests/lang/parse-fail-mixed-nested-attrs1.err.exp b/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp
index 32f776795..32f776795 100644
--- a/tests/lang/parse-fail-mixed-nested-attrs1.err.exp
+++ b/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp
diff --git a/tests/lang/parse-fail-mixed-nested-attrs1.nix b/tests/functional/lang/parse-fail-mixed-nested-attrs1.nix
index 11e40e66f..11e40e66f 100644
--- a/tests/lang/parse-fail-mixed-nested-attrs1.nix
+++ b/tests/functional/lang/parse-fail-mixed-nested-attrs1.nix
diff --git a/tests/lang/parse-fail-mixed-nested-attrs2.err.exp b/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp
index 0437cd50c..0437cd50c 100644
--- a/tests/lang/parse-fail-mixed-nested-attrs2.err.exp
+++ b/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp
diff --git a/tests/lang/parse-fail-mixed-nested-attrs2.nix b/tests/functional/lang/parse-fail-mixed-nested-attrs2.nix
index 17da82e5f..17da82e5f 100644
--- a/tests/lang/parse-fail-mixed-nested-attrs2.nix
+++ b/tests/functional/lang/parse-fail-mixed-nested-attrs2.nix
diff --git a/tests/lang/parse-fail-patterns-1.err.exp b/tests/functional/lang/parse-fail-patterns-1.err.exp
index 634a04aaa..634a04aaa 100644
--- a/tests/lang/parse-fail-patterns-1.err.exp
+++ b/tests/functional/lang/parse-fail-patterns-1.err.exp
diff --git a/tests/lang/parse-fail-patterns-1.nix b/tests/functional/lang/parse-fail-patterns-1.nix
index 7b4061641..7b4061641 100644
--- a/tests/lang/parse-fail-patterns-1.nix
+++ b/tests/functional/lang/parse-fail-patterns-1.nix
diff --git a/tests/lang/parse-fail-regression-20060610.err.exp b/tests/functional/lang/parse-fail-regression-20060610.err.exp
index 167d01e85..167d01e85 100644
--- a/tests/lang/parse-fail-regression-20060610.err.exp
+++ b/tests/functional/lang/parse-fail-regression-20060610.err.exp
diff --git a/tests/lang/parse-fail-regression-20060610.nix b/tests/functional/lang/parse-fail-regression-20060610.nix
index b1934f7e1..b1934f7e1 100644
--- a/tests/lang/parse-fail-regression-20060610.nix
+++ b/tests/functional/lang/parse-fail-regression-20060610.nix
diff --git a/tests/lang/parse-fail-undef-var-2.err.exp b/tests/functional/lang/parse-fail-undef-var-2.err.exp
index 77c96bbd2..77c96bbd2 100644
--- a/tests/lang/parse-fail-undef-var-2.err.exp
+++ b/tests/functional/lang/parse-fail-undef-var-2.err.exp
diff --git a/tests/lang/parse-fail-undef-var-2.nix b/tests/functional/lang/parse-fail-undef-var-2.nix
index c10a52b1e..c10a52b1e 100644
--- a/tests/lang/parse-fail-undef-var-2.nix
+++ b/tests/functional/lang/parse-fail-undef-var-2.nix
diff --git a/tests/lang/parse-fail-undef-var.err.exp b/tests/functional/lang/parse-fail-undef-var.err.exp
index 48e88747f..48e88747f 100644
--- a/tests/lang/parse-fail-undef-var.err.exp
+++ b/tests/functional/lang/parse-fail-undef-var.err.exp
diff --git a/tests/lang/parse-fail-undef-var.nix b/tests/functional/lang/parse-fail-undef-var.nix
index 7b6300811..7b6300811 100644
--- a/tests/lang/parse-fail-undef-var.nix
+++ b/tests/functional/lang/parse-fail-undef-var.nix
diff --git a/tests/lang/parse-fail-utf8.err.exp b/tests/functional/lang/parse-fail-utf8.err.exp
index 6087479a3..6087479a3 100644
--- a/tests/lang/parse-fail-utf8.err.exp
+++ b/tests/functional/lang/parse-fail-utf8.err.exp
diff --git a/tests/lang/parse-fail-utf8.nix b/tests/functional/lang/parse-fail-utf8.nix
index 34948d48a..34948d48a 100644
--- a/tests/lang/parse-fail-utf8.nix
+++ b/tests/functional/lang/parse-fail-utf8.nix
diff --git a/tests/lang/parse-okay-1.exp b/tests/functional/lang/parse-okay-1.exp
index d5ab5f18a..d5ab5f18a 100644
--- a/tests/lang/parse-okay-1.exp
+++ b/tests/functional/lang/parse-okay-1.exp
diff --git a/tests/lang/parse-okay-1.nix b/tests/functional/lang/parse-okay-1.nix
index 23a58ed10..23a58ed10 100644
--- a/tests/lang/parse-okay-1.nix
+++ b/tests/functional/lang/parse-okay-1.nix
diff --git a/tests/lang/parse-okay-crlf.exp b/tests/functional/lang/parse-okay-crlf.exp
index 4213609fc..4213609fc 100644
--- a/tests/lang/parse-okay-crlf.exp
+++ b/tests/functional/lang/parse-okay-crlf.exp
diff --git a/tests/lang/parse-okay-crlf.nix b/tests/functional/lang/parse-okay-crlf.nix
index 21518d4c6..21518d4c6 100644
--- a/tests/lang/parse-okay-crlf.nix
+++ b/tests/functional/lang/parse-okay-crlf.nix
diff --git a/tests/lang/parse-okay-dup-attrs-5.exp b/tests/functional/lang/parse-okay-dup-attrs-5.exp
index 88b0b036f..88b0b036f 100644
--- a/tests/lang/parse-okay-dup-attrs-5.exp
+++ b/tests/functional/lang/parse-okay-dup-attrs-5.exp
diff --git a/tests/lang/parse-okay-dup-attrs-5.nix b/tests/functional/lang/parse-okay-dup-attrs-5.nix
index f4b9efd0c..f4b9efd0c 100644
--- a/tests/lang/parse-okay-dup-attrs-5.nix
+++ b/tests/functional/lang/parse-okay-dup-attrs-5.nix
diff --git a/tests/lang/parse-okay-dup-attrs-6.exp b/tests/functional/lang/parse-okay-dup-attrs-6.exp
index 88b0b036f..88b0b036f 100644
--- a/tests/lang/parse-okay-dup-attrs-6.exp
+++ b/tests/functional/lang/parse-okay-dup-attrs-6.exp
diff --git a/tests/lang/parse-okay-dup-attrs-6.nix b/tests/functional/lang/parse-okay-dup-attrs-6.nix
index ae6d7a769..ae6d7a769 100644
--- a/tests/lang/parse-okay-dup-attrs-6.nix
+++ b/tests/functional/lang/parse-okay-dup-attrs-6.nix
diff --git a/tests/lang/parse-okay-mixed-nested-attrs-1.exp b/tests/functional/lang/parse-okay-mixed-nested-attrs-1.exp
index 89c66f760..89c66f760 100644
--- a/tests/lang/parse-okay-mixed-nested-attrs-1.exp
+++ b/tests/functional/lang/parse-okay-mixed-nested-attrs-1.exp
diff --git a/tests/lang/parse-okay-mixed-nested-attrs-1.nix b/tests/functional/lang/parse-okay-mixed-nested-attrs-1.nix
index fd1001c8c..fd1001c8c 100644
--- a/tests/lang/parse-okay-mixed-nested-attrs-1.nix
+++ b/tests/functional/lang/parse-okay-mixed-nested-attrs-1.nix
diff --git a/tests/lang/parse-okay-mixed-nested-attrs-2.exp b/tests/functional/lang/parse-okay-mixed-nested-attrs-2.exp
index 89c66f760..89c66f760 100644
--- a/tests/lang/parse-okay-mixed-nested-attrs-2.exp
+++ b/tests/functional/lang/parse-okay-mixed-nested-attrs-2.exp
diff --git a/tests/lang/parse-okay-mixed-nested-attrs-2.nix b/tests/functional/lang/parse-okay-mixed-nested-attrs-2.nix
index ad066b680..ad066b680 100644
--- a/tests/lang/parse-okay-mixed-nested-attrs-2.nix
+++ b/tests/functional/lang/parse-okay-mixed-nested-attrs-2.nix
diff --git a/tests/lang/parse-okay-mixed-nested-attrs-3.exp b/tests/functional/lang/parse-okay-mixed-nested-attrs-3.exp
index b89a59734..b89a59734 100644
--- a/tests/lang/parse-okay-mixed-nested-attrs-3.exp
+++ b/tests/functional/lang/parse-okay-mixed-nested-attrs-3.exp
diff --git a/tests/lang/parse-okay-mixed-nested-attrs-3.nix b/tests/functional/lang/parse-okay-mixed-nested-attrs-3.nix
index 45a33e480..45a33e480 100644
--- a/tests/lang/parse-okay-mixed-nested-attrs-3.nix
+++ b/tests/functional/lang/parse-okay-mixed-nested-attrs-3.nix
diff --git a/tests/lang/parse-okay-regression-20041027.exp b/tests/functional/lang/parse-okay-regression-20041027.exp
index 9df7219e4..9df7219e4 100644
--- a/tests/lang/parse-okay-regression-20041027.exp
+++ b/tests/functional/lang/parse-okay-regression-20041027.exp
diff --git a/tests/lang/parse-okay-regression-20041027.nix b/tests/functional/lang/parse-okay-regression-20041027.nix
index ae2e256ee..ae2e256ee 100644
--- a/tests/lang/parse-okay-regression-20041027.nix
+++ b/tests/functional/lang/parse-okay-regression-20041027.nix
diff --git a/tests/lang/parse-okay-regression-751.exp b/tests/functional/lang/parse-okay-regression-751.exp
index e2ed886fe..e2ed886fe 100644
--- a/tests/lang/parse-okay-regression-751.exp
+++ b/tests/functional/lang/parse-okay-regression-751.exp
diff --git a/tests/lang/parse-okay-regression-751.nix b/tests/functional/lang/parse-okay-regression-751.nix
index 05c78b301..05c78b301 100644
--- a/tests/lang/parse-okay-regression-751.nix
+++ b/tests/functional/lang/parse-okay-regression-751.nix
diff --git a/tests/lang/parse-okay-subversion.exp b/tests/functional/lang/parse-okay-subversion.exp
index 4168ee8bf..4168ee8bf 100644
--- a/tests/lang/parse-okay-subversion.exp
+++ b/tests/functional/lang/parse-okay-subversion.exp
diff --git a/tests/lang/parse-okay-subversion.nix b/tests/functional/lang/parse-okay-subversion.nix
index 356272815..356272815 100644
--- a/tests/lang/parse-okay-subversion.nix
+++ b/tests/functional/lang/parse-okay-subversion.nix
diff --git a/tests/lang/parse-okay-url.exp b/tests/functional/lang/parse-okay-url.exp
index e5f0829b0..e5f0829b0 100644
--- a/tests/lang/parse-okay-url.exp
+++ b/tests/functional/lang/parse-okay-url.exp
diff --git a/tests/lang/parse-okay-url.nix b/tests/functional/lang/parse-okay-url.nix
index 08de27d0a..08de27d0a 100644
--- a/tests/lang/parse-okay-url.nix
+++ b/tests/functional/lang/parse-okay-url.nix
diff --git a/tests/lang/readDir/bar b/tests/functional/lang/readDir/bar
index e69de29bb..e69de29bb 100644
--- a/tests/lang/readDir/bar
+++ b/tests/functional/lang/readDir/bar
diff --git a/tests/lang/readDir/foo/git-hates-directories b/tests/functional/lang/readDir/foo/git-hates-directories
index e69de29bb..e69de29bb 100644
--- a/tests/lang/readDir/foo/git-hates-directories
+++ b/tests/functional/lang/readDir/foo/git-hates-directories
diff --git a/tests/lang/readDir/ldir b/tests/functional/lang/readDir/ldir
index 191028156..191028156 120000
--- a/tests/lang/readDir/ldir
+++ b/tests/functional/lang/readDir/ldir
diff --git a/tests/lang/readDir/linked b/tests/functional/lang/readDir/linked
index c503f86a0..c503f86a0 120000
--- a/tests/lang/readDir/linked
+++ b/tests/functional/lang/readDir/linked
diff --git a/tests/legacy-ssh-store.sh b/tests/functional/legacy-ssh-store.sh
index 71b716b84..71b716b84 100644
--- a/tests/legacy-ssh-store.sh
+++ b/tests/functional/legacy-ssh-store.sh
diff --git a/tests/linux-sandbox-cert-test.nix b/tests/functional/linux-sandbox-cert-test.nix
index 2fc083ea9..2fc083ea9 100644
--- a/tests/linux-sandbox-cert-test.nix
+++ b/tests/functional/linux-sandbox-cert-test.nix
diff --git a/tests/linux-sandbox.sh b/tests/functional/linux-sandbox.sh
index ff7d257bd..ff7d257bd 100644
--- a/tests/linux-sandbox.sh
+++ b/tests/functional/linux-sandbox.sh
diff --git a/tests/local-store.sh b/tests/functional/local-store.sh
index 89502f864..89502f864 100644
--- a/tests/local-store.sh
+++ b/tests/functional/local-store.sh
diff --git a/tests/local.mk b/tests/functional/local.mk
index 4edf31303..d60f1e08e 100644
--- a/tests/local.mk
+++ b/tests/functional/local.mk
@@ -103,7 +103,6 @@ nix_tests = \
   case-hack.sh \
   placeholders.sh \
   ssh-relay.sh \
-  plugins.sh \
   build.sh \
   build-delete.sh \
   output-normalization.sh \
@@ -128,17 +127,20 @@ ifeq ($(HAVE_LIBCPUID), 1)
 	nix_tests += compute-levels.sh
 endif
 
+ifeq ($(BUILD_SHARED_LIBS), 1)
+	nix_tests += plugins.sh
+endif
+
+$(d)/test-libstoreconsumer.sh.test $(d)/test-libstoreconsumer.sh.test-debug: \
+  $(d)/test-libstoreconsumer/test-libstoreconsumer
+$(d)/plugins.sh.test $(d)/plugins.sh.test-debug: \
+  $(d)/plugins/libplugintest.$(SO_EXT)
+
 install-tests += $(foreach x, $(nix_tests), $(d)/$(x))
 
-clean-files += \
+test-clean-files := \
   $(d)/common/vars-and-functions.sh \
   $(d)/config.nix
 
-test-deps += \
-  tests/common/vars-and-functions.sh \
-  tests/config.nix \
-  tests/test-libstoreconsumer/test-libstoreconsumer
-
-ifeq ($(BUILD_SHARED_LIBS), 1)
-  test-deps += tests/plugins/libplugintest.$(SO_EXT)
-endif
+clean-files += $(test-clean-files)
+test-deps += $(test-clean-files)
diff --git a/tests/logging.sh b/tests/functional/logging.sh
index 1481b9b36..1481b9b36 100644
--- a/tests/logging.sh
+++ b/tests/functional/logging.sh
diff --git a/tests/misc.sh b/tests/functional/misc.sh
index af96d20bd..af96d20bd 100644
--- a/tests/misc.sh
+++ b/tests/functional/misc.sh
diff --git a/tests/multiple-outputs.nix b/tests/functional/multiple-outputs.nix
index 413d392e4..413d392e4 100644
--- a/tests/multiple-outputs.nix
+++ b/tests/functional/multiple-outputs.nix
diff --git a/tests/multiple-outputs.sh b/tests/functional/multiple-outputs.sh
index 330600d08..330600d08 100644
--- a/tests/multiple-outputs.sh
+++ b/tests/functional/multiple-outputs.sh
diff --git a/tests/nar-access.nix b/tests/functional/nar-access.nix
index 0e2a7f721..0e2a7f721 100644
--- a/tests/nar-access.nix
+++ b/tests/functional/nar-access.nix
diff --git a/tests/nar-access.sh b/tests/functional/nar-access.sh
index d487d58d2..d487d58d2 100644
--- a/tests/nar-access.sh
+++ b/tests/functional/nar-access.sh
diff --git a/tests/nested-sandboxing.sh b/tests/functional/nested-sandboxing.sh
index d9fa788aa..61fe043c6 100644
--- a/tests/nested-sandboxing.sh
+++ b/tests/functional/nested-sandboxing.sh
@@ -1,5 +1,5 @@
 source common.sh
-# This test is run by `tests/nested-sandboxing/runner.nix` in an extra layer of sandboxing.
+# This test is run by `tests/functional/nested-sandboxing/runner.nix` in an extra layer of sandboxing.
 [[ -d /nix/store ]] || skipTest "running this test without Nix's deps being drawn from /nix/store is not yet supported"
 
 requireSandboxSupport
diff --git a/tests/nested-sandboxing/command.sh b/tests/functional/nested-sandboxing/command.sh
index 69366486c..69366486c 100644
--- a/tests/nested-sandboxing/command.sh
+++ b/tests/functional/nested-sandboxing/command.sh
diff --git a/tests/nested-sandboxing/runner.nix b/tests/functional/nested-sandboxing/runner.nix
index 9a5822c88..9a5822c88 100644
--- a/tests/nested-sandboxing/runner.nix
+++ b/tests/functional/nested-sandboxing/runner.nix
diff --git a/tests/nix-build-examples.nix b/tests/functional/nix-build-examples.nix
index e54dbbf62..e54dbbf62 100644
--- a/tests/nix-build-examples.nix
+++ b/tests/functional/nix-build-examples.nix
diff --git a/tests/nix-build.sh b/tests/functional/nix-build.sh
index 44a5a14cd..44a5a14cd 100644
--- a/tests/nix-build.sh
+++ b/tests/functional/nix-build.sh
diff --git a/tests/nix-channel.sh b/tests/functional/nix-channel.sh
index b5d935004..b5d935004 100644
--- a/tests/nix-channel.sh
+++ b/tests/functional/nix-channel.sh
diff --git a/tests/nix-collect-garbage-d.sh b/tests/functional/nix-collect-garbage-d.sh
index bf30f8938..bf30f8938 100644
--- a/tests/nix-collect-garbage-d.sh
+++ b/tests/functional/nix-collect-garbage-d.sh
diff --git a/tests/nix-copy-ssh-ng.sh b/tests/functional/nix-copy-ssh-ng.sh
index 45e53c9c0..45e53c9c0 100644
--- a/tests/nix-copy-ssh-ng.sh
+++ b/tests/functional/nix-copy-ssh-ng.sh
diff --git a/tests/nix-copy-ssh.sh b/tests/functional/nix-copy-ssh.sh
index eb801548d..eb801548d 100644
--- a/tests/nix-copy-ssh.sh
+++ b/tests/functional/nix-copy-ssh.sh
diff --git a/tests/nix-daemon-untrusting.sh b/tests/functional/nix-daemon-untrusting.sh
index bcdb70989..bcdb70989 100755
--- a/tests/nix-daemon-untrusting.sh
+++ b/tests/functional/nix-daemon-untrusting.sh
diff --git a/tests/nix-profile.sh b/tests/functional/nix-profile.sh
index 7c478a0cd..7c478a0cd 100644
--- a/tests/nix-profile.sh
+++ b/tests/functional/nix-profile.sh
diff --git a/tests/nix-shell.sh b/tests/functional/nix-shell.sh
index edaa1249b..edaa1249b 100644
--- a/tests/nix-shell.sh
+++ b/tests/functional/nix-shell.sh
diff --git a/tests/nix_path.sh b/tests/functional/nix_path.sh
index 2b222b4a1..2b222b4a1 100644
--- a/tests/nix_path.sh
+++ b/tests/functional/nix_path.sh
diff --git a/tests/optimise-store.sh b/tests/functional/optimise-store.sh
index 8c2d05cd5..8c2d05cd5 100644
--- a/tests/optimise-store.sh
+++ b/tests/functional/optimise-store.sh
diff --git a/tests/output-normalization.sh b/tests/functional/output-normalization.sh
index 0f6df5e31..0f6df5e31 100644
--- a/tests/output-normalization.sh
+++ b/tests/functional/output-normalization.sh
diff --git a/tests/parallel.builder.sh b/tests/functional/parallel.builder.sh
index d092bc5a6..d092bc5a6 100644
--- a/tests/parallel.builder.sh
+++ b/tests/functional/parallel.builder.sh
diff --git a/tests/parallel.nix b/tests/functional/parallel.nix
index 23f142059..23f142059 100644
--- a/tests/parallel.nix
+++ b/tests/functional/parallel.nix
diff --git a/tests/parallel.sh b/tests/functional/parallel.sh
index 3b7bbe5a2..3b7bbe5a2 100644
--- a/tests/parallel.sh
+++ b/tests/functional/parallel.sh
diff --git a/tests/pass-as-file.sh b/tests/functional/pass-as-file.sh
index 2c0bc5031..2c0bc5031 100644
--- a/tests/pass-as-file.sh
+++ b/tests/functional/pass-as-file.sh
diff --git a/tests/path-from-hash-part.sh b/tests/functional/path-from-hash-part.sh
index bdd104434..bdd104434 100644
--- a/tests/path-from-hash-part.sh
+++ b/tests/functional/path-from-hash-part.sh
diff --git a/tests/path.nix b/tests/functional/path.nix
index 883c3c41b..883c3c41b 100644
--- a/tests/path.nix
+++ b/tests/functional/path.nix
diff --git a/tests/placeholders.sh b/tests/functional/placeholders.sh
index cd1bb7bc2..cd1bb7bc2 100644
--- a/tests/placeholders.sh
+++ b/tests/functional/placeholders.sh
diff --git a/tests/plugins.sh b/tests/functional/plugins.sh
index baf71a362..baf71a362 100644
--- a/tests/plugins.sh
+++ b/tests/functional/plugins.sh
diff --git a/tests/plugins/local.mk b/tests/functional/plugins/local.mk
index 40350aa96..40350aa96 100644
--- a/tests/plugins/local.mk
+++ b/tests/functional/plugins/local.mk
diff --git a/tests/plugins/plugintest.cc b/tests/functional/plugins/plugintest.cc
index e02fd68d5..e02fd68d5 100644
--- a/tests/plugins/plugintest.cc
+++ b/tests/functional/plugins/plugintest.cc
diff --git a/tests/post-hook.sh b/tests/functional/post-hook.sh
index 752f8220c..752f8220c 100644
--- a/tests/post-hook.sh
+++ b/tests/functional/post-hook.sh
diff --git a/tests/pure-eval.nix b/tests/functional/pure-eval.nix
index ed25b3d45..ed25b3d45 100644
--- a/tests/pure-eval.nix
+++ b/tests/functional/pure-eval.nix
diff --git a/tests/pure-eval.sh b/tests/functional/pure-eval.sh
index 5334bf28e..5334bf28e 100644
--- a/tests/pure-eval.sh
+++ b/tests/functional/pure-eval.sh
diff --git a/tests/push-to-store-old.sh b/tests/functional/push-to-store-old.sh
index 4187958b2..4187958b2 100755
--- a/tests/push-to-store-old.sh
+++ b/tests/functional/push-to-store-old.sh
diff --git a/tests/push-to-store.sh b/tests/functional/push-to-store.sh
index 9e4e475e0..9e4e475e0 100755
--- a/tests/push-to-store.sh
+++ b/tests/functional/push-to-store.sh
diff --git a/tests/read-only-store.sh b/tests/functional/read-only-store.sh
index d63920c19..d63920c19 100644
--- a/tests/read-only-store.sh
+++ b/tests/functional/read-only-store.sh
diff --git a/tests/readfile-context.nix b/tests/functional/readfile-context.nix
index 54cd1afd9..54cd1afd9 100644
--- a/tests/readfile-context.nix
+++ b/tests/functional/readfile-context.nix
diff --git a/tests/readfile-context.sh b/tests/functional/readfile-context.sh
index 31e70ddb1..31e70ddb1 100644
--- a/tests/readfile-context.sh
+++ b/tests/functional/readfile-context.sh
diff --git a/tests/recursive.nix b/tests/functional/recursive.nix
index fa8cc04db..fa8cc04db 100644
--- a/tests/recursive.nix
+++ b/tests/functional/recursive.nix
diff --git a/tests/recursive.sh b/tests/functional/recursive.sh
index 0bf00f8fa..0bf00f8fa 100644
--- a/tests/recursive.sh
+++ b/tests/functional/recursive.sh
diff --git a/tests/referrers.sh b/tests/functional/referrers.sh
index 81323c280..81323c280 100644
--- a/tests/referrers.sh
+++ b/tests/functional/referrers.sh
diff --git a/tests/remote-store.sh b/tests/functional/remote-store.sh
index 50e6f24b9..50e6f24b9 100644
--- a/tests/remote-store.sh
+++ b/tests/functional/remote-store.sh
diff --git a/tests/repair.sh b/tests/functional/repair.sh
index c8f07b1c6..c8f07b1c6 100644
--- a/tests/repair.sh
+++ b/tests/functional/repair.sh
diff --git a/tests/repl.sh b/tests/functional/repl.sh
index bb8b60e50..bb8b60e50 100644
--- a/tests/repl.sh
+++ b/tests/functional/repl.sh
diff --git a/tests/restricted.nix b/tests/functional/restricted.nix
index e0ef58402..e0ef58402 100644
--- a/tests/restricted.nix
+++ b/tests/functional/restricted.nix
diff --git a/tests/restricted.sh b/tests/functional/restricted.sh
index 17f310a4b..197ae7a10 100644
--- a/tests/restricted.sh
+++ b/tests/functional/restricted.sh
@@ -9,10 +9,10 @@ nix-instantiate --restrict-eval ./simple.nix -I src=.
 nix-instantiate --restrict-eval ./simple.nix -I src1=simple.nix -I src2=config.nix -I src3=./simple.builder.sh
 
 (! nix-instantiate --restrict-eval --eval -E 'builtins.readFile ./simple.nix')
-nix-instantiate --restrict-eval --eval -E 'builtins.readFile ./simple.nix' -I src=..
+nix-instantiate --restrict-eval --eval -E 'builtins.readFile ./simple.nix' -I src=../..
 
-(! nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../src/nix-channel')
-nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../src/nix-channel' -I src=../src
+(! nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../../src/nix-channel')
+nix-instantiate --restrict-eval --eval -E 'builtins.readDir ../../src/nix-channel' -I src=../../src
 
 (! nix-instantiate --restrict-eval --eval -E 'let __nixPath = [ { prefix = "foo"; path = ./.; } ]; in <foo>')
 nix-instantiate --restrict-eval --eval -E 'let __nixPath = [ { prefix = "foo"; path = ./.; } ]; in <foo>' -I src=.
diff --git a/tests/search.nix b/tests/functional/search.nix
index fea6e7a7a..fea6e7a7a 100644
--- a/tests/search.nix
+++ b/tests/functional/search.nix
diff --git a/tests/search.sh b/tests/functional/search.sh
index 8742f8736..8742f8736 100644
--- a/tests/search.sh
+++ b/tests/functional/search.sh
diff --git a/tests/secure-drv-outputs.nix b/tests/functional/secure-drv-outputs.nix
index b4ac8ff53..b4ac8ff53 100644
--- a/tests/secure-drv-outputs.nix
+++ b/tests/functional/secure-drv-outputs.nix
diff --git a/tests/secure-drv-outputs.sh b/tests/functional/secure-drv-outputs.sh
index 50a9c4428..50a9c4428 100644
--- a/tests/secure-drv-outputs.sh
+++ b/tests/functional/secure-drv-outputs.sh
diff --git a/tests/selfref-gc.sh b/tests/functional/selfref-gc.sh
index 3f1f50eea..3f1f50eea 100644
--- a/tests/selfref-gc.sh
+++ b/tests/functional/selfref-gc.sh
diff --git a/tests/shell-hello.nix b/tests/functional/shell-hello.nix
index 3fdd3501d..3fdd3501d 100644
--- a/tests/shell-hello.nix
+++ b/tests/functional/shell-hello.nix
diff --git a/tests/shell.nix b/tests/functional/shell.nix
index 92d94fbc2..92d94fbc2 100644
--- a/tests/shell.nix
+++ b/tests/functional/shell.nix
diff --git a/tests/shell.sh b/tests/functional/shell.sh
index d2f7cf14e..d2f7cf14e 100644
--- a/tests/shell.sh
+++ b/tests/functional/shell.sh
diff --git a/tests/shell.shebang.rb b/tests/functional/shell.shebang.rb
index ea67eb09c..ea67eb09c 100644
--- a/tests/shell.shebang.rb
+++ b/tests/functional/shell.shebang.rb
diff --git a/tests/shell.shebang.sh b/tests/functional/shell.shebang.sh
index f7132043d..f7132043d 100755
--- a/tests/shell.shebang.sh
+++ b/tests/functional/shell.shebang.sh
diff --git a/tests/signing.sh b/tests/functional/signing.sh
index 942b51630..942b51630 100644
--- a/tests/signing.sh
+++ b/tests/functional/signing.sh
diff --git a/tests/simple-failing.nix b/tests/functional/simple-failing.nix
index d176c9c51..d176c9c51 100644
--- a/tests/simple-failing.nix
+++ b/tests/functional/simple-failing.nix
diff --git a/tests/simple.builder.sh b/tests/functional/simple.builder.sh
index 569e8ca88..569e8ca88 100644
--- a/tests/simple.builder.sh
+++ b/tests/functional/simple.builder.sh
diff --git a/tests/simple.nix b/tests/functional/simple.nix
index 4223c0f23..4223c0f23 100644
--- a/tests/simple.nix
+++ b/tests/functional/simple.nix
diff --git a/tests/simple.sh b/tests/functional/simple.sh
index 50d44f93f..50d44f93f 100644
--- a/tests/simple.sh
+++ b/tests/functional/simple.sh
diff --git a/tests/ssh-relay.sh b/tests/functional/ssh-relay.sh
index 053b2f00d..053b2f00d 100644
--- a/tests/ssh-relay.sh
+++ b/tests/functional/ssh-relay.sh
diff --git a/tests/store-ping.sh b/tests/functional/store-ping.sh
index 9846c7d3d..9846c7d3d 100644
--- a/tests/store-ping.sh
+++ b/tests/functional/store-ping.sh
diff --git a/tests/structured-attrs-shell.nix b/tests/functional/structured-attrs-shell.nix
index 57c1e6bd2..57c1e6bd2 100644
--- a/tests/structured-attrs-shell.nix
+++ b/tests/functional/structured-attrs-shell.nix
diff --git a/tests/structured-attrs.nix b/tests/functional/structured-attrs.nix
index e93139a44..e93139a44 100644
--- a/tests/structured-attrs.nix
+++ b/tests/functional/structured-attrs.nix
diff --git a/tests/structured-attrs.sh b/tests/functional/structured-attrs.sh
index 378dbc735..378dbc735 100644
--- a/tests/structured-attrs.sh
+++ b/tests/functional/structured-attrs.sh
diff --git a/tests/substitute-with-invalid-ca.sh b/tests/functional/substitute-with-invalid-ca.sh
index 4d0b01e0f..4d0b01e0f 100644
--- a/tests/substitute-with-invalid-ca.sh
+++ b/tests/functional/substitute-with-invalid-ca.sh
diff --git a/tests/suggestions.sh b/tests/functional/suggestions.sh
index f18fefef9..f18fefef9 100644
--- a/tests/suggestions.sh
+++ b/tests/functional/suggestions.sh
diff --git a/tests/supplementary-groups.sh b/tests/functional/supplementary-groups.sh
index d18fb2414..d18fb2414 100644
--- a/tests/supplementary-groups.sh
+++ b/tests/functional/supplementary-groups.sh
diff --git a/tests/tarball.sh b/tests/functional/tarball.sh
index 6e621a28c..6e621a28c 100644
--- a/tests/tarball.sh
+++ b/tests/functional/tarball.sh
diff --git a/tests/test-infra.sh b/tests/functional/test-infra.sh
index 54ae120e7..54ae120e7 100644
--- a/tests/test-infra.sh
+++ b/tests/functional/test-infra.sh
diff --git a/tests/test-libstoreconsumer.sh b/tests/functional/test-libstoreconsumer.sh
index 8a77cf5a1..8a77cf5a1 100644
--- a/tests/test-libstoreconsumer.sh
+++ b/tests/functional/test-libstoreconsumer.sh
diff --git a/tests/test-libstoreconsumer/README.md b/tests/functional/test-libstoreconsumer/README.md
index ded69850f..ded69850f 100644
--- a/tests/test-libstoreconsumer/README.md
+++ b/tests/functional/test-libstoreconsumer/README.md
diff --git a/tests/test-libstoreconsumer/local.mk b/tests/functional/test-libstoreconsumer/local.mk
index edc140723..edc140723 100644
--- a/tests/test-libstoreconsumer/local.mk
+++ b/tests/functional/test-libstoreconsumer/local.mk
diff --git a/tests/test-libstoreconsumer/main.cc b/tests/functional/test-libstoreconsumer/main.cc
index c61489af6..c61489af6 100644
--- a/tests/test-libstoreconsumer/main.cc
+++ b/tests/functional/test-libstoreconsumer/main.cc
diff --git a/tests/timeout.nix b/tests/functional/timeout.nix
index d0e949e31..d0e949e31 100644
--- a/tests/timeout.nix
+++ b/tests/functional/timeout.nix
diff --git a/tests/timeout.sh b/tests/functional/timeout.sh
index b179b79a2..b179b79a2 100644
--- a/tests/timeout.sh
+++ b/tests/functional/timeout.sh
diff --git a/tests/toString-path.sh b/tests/functional/toString-path.sh
index 07eb87465..07eb87465 100644
--- a/tests/toString-path.sh
+++ b/tests/functional/toString-path.sh
diff --git a/tests/undefined-variable.nix b/tests/functional/undefined-variable.nix
index 579985497..579985497 100644
--- a/tests/undefined-variable.nix
+++ b/tests/functional/undefined-variable.nix
diff --git a/tests/user-envs-migration.sh b/tests/functional/user-envs-migration.sh
index 187372b16..187372b16 100644
--- a/tests/user-envs-migration.sh
+++ b/tests/functional/user-envs-migration.sh
diff --git a/tests/user-envs.builder.sh b/tests/functional/user-envs.builder.sh
index 5fafa797f..5fafa797f 100644
--- a/tests/user-envs.builder.sh
+++ b/tests/functional/user-envs.builder.sh
diff --git a/tests/user-envs.nix b/tests/functional/user-envs.nix
index 46f8b51dd..46f8b51dd 100644
--- a/tests/user-envs.nix
+++ b/tests/functional/user-envs.nix
diff --git a/tests/user-envs.sh b/tests/functional/user-envs.sh
index d1260ba04..d1260ba04 100644
--- a/tests/user-envs.sh
+++ b/tests/functional/user-envs.sh
diff --git a/tests/why-depends.sh b/tests/functional/why-depends.sh
index 9680bf80e..9680bf80e 100644
--- a/tests/why-depends.sh
+++ b/tests/functional/why-depends.sh
diff --git a/tests/zstd.sh b/tests/functional/zstd.sh
index ba7c20501..ba7c20501 100644
--- a/tests/zstd.sh
+++ b/tests/functional/zstd.sh
diff --git a/tests/unit/libexpr-support/local.mk b/tests/unit/libexpr-support/local.mk
new file mode 100644
index 000000000..6b3ad64ee
--- /dev/null
+++ b/tests/unit/libexpr-support/local.mk
@@ -0,0 +1,19 @@
+libraries += libexpr-test-support
+
+libexpr-test-support_NAME = libnixexpr-test-support
+
+libexpr-test-support_DIR := $(d)
+
+libexpr-test-support_INSTALL_DIR :=
+
+libexpr-test-support_SOURCES := \
+    $(wildcard $(d)/tests/*.cc) \
+    $(wildcard $(d)/tests/value/*.cc)
+
+libexpr-test-support_CXXFLAGS += $(libexpr-tests_EXTRA_INCLUDES)
+
+libexpr-test-support_LIBS = \
+    libstore-test-support libutil-test-support \
+    libexpr libstore libutil
+
+libexpr-test-support_LDFLAGS := -lrapidcheck
diff --git a/src/libexpr/tests/libexpr.hh b/tests/unit/libexpr-support/tests/libexpr.hh
index b8e65aafe..b8e65aafe 100644
--- a/src/libexpr/tests/libexpr.hh
+++ b/tests/unit/libexpr-support/tests/libexpr.hh
diff --git a/tests/unit/libexpr-support/tests/value/context.cc b/tests/unit/libexpr-support/tests/value/context.cc
new file mode 100644
index 000000000..8658bdaef
--- /dev/null
+++ b/tests/unit/libexpr-support/tests/value/context.cc
@@ -0,0 +1,30 @@
+#include <rapidcheck.h>
+
+#include "tests/path.hh"
+#include "tests/value/context.hh"
+
+namespace rc {
+using namespace nix;
+
+Gen<NixStringContextElem::DrvDeep> Arbitrary<NixStringContextElem::DrvDeep>::arbitrary()
+{
+    return gen::just(NixStringContextElem::DrvDeep {
+        .drvPath = *gen::arbitrary<StorePath>(),
+    });
+}
+
+Gen<NixStringContextElem> Arbitrary<NixStringContextElem>::arbitrary()
+{
+    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<NixStringContextElem::Raw>)) {
+    case 0:
+        return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Opaque>());
+    case 1:
+        return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::DrvDeep>());
+    case 2:
+        return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Built>());
+    default:
+        assert(false);
+    }
+}
+
+}
diff --git a/src/libexpr/tests/value/context.hh b/tests/unit/libexpr-support/tests/value/context.hh
index c0bc97ba3..8c68c78bb 100644
--- a/src/libexpr/tests/value/context.hh
+++ b/tests/unit/libexpr-support/tests/value/context.hh
@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <value/context.hh>
+#include "value/context.hh"
 
 namespace rc {
 using namespace nix;
diff --git a/src/libexpr/tests/derived-path.cc b/tests/unit/libexpr/derived-path.cc
index d5fc6f201..d5fc6f201 100644
--- a/src/libexpr/tests/derived-path.cc
+++ b/tests/unit/libexpr/derived-path.cc
diff --git a/src/libexpr/tests/error_traces.cc b/tests/unit/libexpr/error_traces.cc
index 285651256..285651256 100644
--- a/src/libexpr/tests/error_traces.cc
+++ b/tests/unit/libexpr/error_traces.cc
diff --git a/src/libexpr/tests/flakeref.cc b/tests/unit/libexpr/flakeref.cc
index 2b7809b93..2b7809b93 100644
--- a/src/libexpr/tests/flakeref.cc
+++ b/tests/unit/libexpr/flakeref.cc
diff --git a/src/libexpr/tests/json.cc b/tests/unit/libexpr/json.cc
index 7586bdd9b..7586bdd9b 100644
--- a/src/libexpr/tests/json.cc
+++ b/tests/unit/libexpr/json.cc
diff --git a/tests/unit/libexpr/local.mk b/tests/unit/libexpr/local.mk
new file mode 100644
index 000000000..068dd7a17
--- /dev/null
+++ b/tests/unit/libexpr/local.mk
@@ -0,0 +1,32 @@
+check: libexpr-tests_RUN
+
+programs += libexpr-tests
+
+libexpr-tests_NAME := libnixexpr-tests
+
+libexpr-tests_ENV := _NIX_TEST_UNIT_DATA=$(d)/data
+
+libexpr-tests_DIR := $(d)
+
+libexpr-tests_INSTALL_DIR :=
+
+libexpr-tests_SOURCES := \
+    $(wildcard $(d)/*.cc) \
+    $(wildcard $(d)/value/*.cc)
+
+libexpr-tests_EXTRA_INCLUDES = \
+    -I tests/unit/libexpr-support \
+    -I tests/unit/libstore-support \
+    -I tests/unit/libutil-support \
+    -I src/libexpr \
+    -I src/libfetchers \
+    -I src/libstore \
+    -I src/libutil
+
+libexpr-tests_CXXFLAGS += $(libexpr-tests_EXTRA_INCLUDES)
+
+libexpr-tests_LIBS = \
+    libexpr-test-support libstore-test-support libutils-test-support \
+    libexpr libfetchers libstore libutil
+
+libexpr-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS) -lgmock
diff --git a/src/libexpr/tests/primops.cc b/tests/unit/libexpr/primops.cc
index ce3b5d11f..ce3b5d11f 100644
--- a/src/libexpr/tests/primops.cc
+++ b/tests/unit/libexpr/primops.cc
diff --git a/src/libexpr/tests/search-path.cc b/tests/unit/libexpr/search-path.cc
index dbe7ab95f..dbe7ab95f 100644
--- a/src/libexpr/tests/search-path.cc
+++ b/tests/unit/libexpr/search-path.cc
diff --git a/src/libexpr/tests/trivial.cc b/tests/unit/libexpr/trivial.cc
index 171727ac7..171727ac7 100644
--- a/src/libexpr/tests/trivial.cc
+++ b/tests/unit/libexpr/trivial.cc
diff --git a/src/libexpr/tests/value/context.cc b/tests/unit/libexpr/value/context.cc
index 92d4889ab..761286dbd 100644
--- a/src/libexpr/tests/value/context.cc
+++ b/tests/unit/libexpr/value/context.cc
@@ -117,36 +117,6 @@ TEST(NixStringContextElemTest, built_built_xp) {
         NixStringContextElem::parse("!foo!bar!g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv"),        MissingExperimentalFeature);
 }
 
-}
-
-namespace rc {
-using namespace nix;
-
-Gen<NixStringContextElem::DrvDeep> Arbitrary<NixStringContextElem::DrvDeep>::arbitrary()
-{
-    return gen::just(NixStringContextElem::DrvDeep {
-        .drvPath = *gen::arbitrary<StorePath>(),
-    });
-}
-
-Gen<NixStringContextElem> Arbitrary<NixStringContextElem>::arbitrary()
-{
-    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<NixStringContextElem::Raw>)) {
-    case 0:
-        return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Opaque>());
-    case 1:
-        return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::DrvDeep>());
-    case 2:
-        return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Built>());
-    default:
-        assert(false);
-    }
-}
-
-}
-
-namespace nix {
-
 #ifndef COVERAGE
 
 RC_GTEST_PROP(
diff --git a/src/libexpr/tests/value/print.cc b/tests/unit/libexpr/value/print.cc
index 5e96e12ec..5e96e12ec 100644
--- a/src/libexpr/tests/value/print.cc
+++ b/tests/unit/libexpr/value/print.cc
diff --git a/tests/unit/libstore-support/local.mk b/tests/unit/libstore-support/local.mk
new file mode 100644
index 000000000..2738278d8
--- /dev/null
+++ b/tests/unit/libstore-support/local.mk
@@ -0,0 +1,17 @@
+libraries += libstore-test-support
+
+libstore-test-support_NAME = libnixstore-test-support
+
+libstore-test-support_DIR := $(d)
+
+libstore-test-support_INSTALL_DIR :=
+
+libstore-test-support_SOURCES := $(wildcard $(d)/tests/*.cc)
+
+libstore-test-support_CXXFLAGS += $(libstore-tests_EXTRA_INCLUDES)
+
+libstore-test-support_LIBS = \
+    libutil-test-support \
+    libstore libutil
+
+libstore-test-support_LDFLAGS := -lrapidcheck
diff --git a/tests/unit/libstore-support/tests/derived-path.cc b/tests/unit/libstore-support/tests/derived-path.cc
new file mode 100644
index 000000000..091706dba
--- /dev/null
+++ b/tests/unit/libstore-support/tests/derived-path.cc
@@ -0,0 +1,57 @@
+#include <regex>
+
+#include <rapidcheck.h>
+
+#include "tests/derived-path.hh"
+
+namespace rc {
+using namespace nix;
+
+Gen<DerivedPath::Opaque> Arbitrary<DerivedPath::Opaque>::arbitrary()
+{
+    return gen::just(DerivedPath::Opaque {
+        .path = *gen::arbitrary<StorePath>(),
+    });
+}
+
+Gen<SingleDerivedPath::Built> Arbitrary<SingleDerivedPath::Built>::arbitrary()
+{
+    return gen::just(SingleDerivedPath::Built {
+        .drvPath = make_ref<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath>()),
+        .output = (*gen::arbitrary<StorePathName>()).name,
+    });
+}
+
+Gen<DerivedPath::Built> Arbitrary<DerivedPath::Built>::arbitrary()
+{
+    return gen::just(DerivedPath::Built {
+        .drvPath = make_ref<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath>()),
+        .outputs = *gen::arbitrary<OutputsSpec>(),
+    });
+}
+
+Gen<SingleDerivedPath> Arbitrary<SingleDerivedPath>::arbitrary()
+{
+    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<SingleDerivedPath::Raw>)) {
+    case 0:
+        return gen::just<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath::Opaque>());
+    case 1:
+        return gen::just<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath::Built>());
+    default:
+        assert(false);
+    }
+}
+
+Gen<DerivedPath> Arbitrary<DerivedPath>::arbitrary()
+{
+    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<DerivedPath::Raw>)) {
+    case 0:
+        return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Opaque>());
+    case 1:
+        return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Built>());
+    default:
+        assert(false);
+    }
+}
+
+}
diff --git a/src/libstore/tests/derived-path.hh b/tests/unit/libstore-support/tests/derived-path.hh
index 98d61f228..98d61f228 100644
--- a/src/libstore/tests/derived-path.hh
+++ b/tests/unit/libstore-support/tests/derived-path.hh
diff --git a/src/libstore/tests/libstore.hh b/tests/unit/libstore-support/tests/libstore.hh
index ef93457b5..ef93457b5 100644
--- a/src/libstore/tests/libstore.hh
+++ b/tests/unit/libstore-support/tests/libstore.hh
diff --git a/tests/unit/libstore-support/tests/outputs-spec.cc b/tests/unit/libstore-support/tests/outputs-spec.cc
new file mode 100644
index 000000000..e9d602203
--- /dev/null
+++ b/tests/unit/libstore-support/tests/outputs-spec.cc
@@ -0,0 +1,24 @@
+#include "tests/outputs-spec.hh"
+
+#include <rapidcheck.h>
+
+namespace rc {
+using namespace nix;
+
+Gen<OutputsSpec> Arbitrary<OutputsSpec>::arbitrary()
+{
+    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<OutputsSpec::Raw>)) {
+    case 0:
+        return gen::just((OutputsSpec) OutputsSpec::All { });
+    case 1:
+        return gen::just((OutputsSpec) OutputsSpec::Names {
+            *gen::nonEmpty(gen::container<StringSet>(gen::map(
+                gen::arbitrary<StorePathName>(),
+                [](StorePathName n) { return n.name; }))),
+        });
+    default:
+        assert(false);
+    }
+}
+
+}
diff --git a/src/libstore/tests/outputs-spec.hh b/tests/unit/libstore-support/tests/outputs-spec.hh
index ded331b33..f5bf9042d 100644
--- a/src/libstore/tests/outputs-spec.hh
+++ b/tests/unit/libstore-support/tests/outputs-spec.hh
@@ -5,7 +5,7 @@
 
 #include <outputs-spec.hh>
 
-#include <tests/path.hh>
+#include "tests/path.hh"
 
 namespace rc {
 using namespace nix;
diff --git a/tests/unit/libstore-support/tests/path.cc b/tests/unit/libstore-support/tests/path.cc
new file mode 100644
index 000000000..e5f169e94
--- /dev/null
+++ b/tests/unit/libstore-support/tests/path.cc
@@ -0,0 +1,82 @@
+#include <regex>
+
+#include <rapidcheck.h>
+
+#include "path-regex.hh"
+#include "store-api.hh"
+
+#include "tests/hash.hh"
+#include "tests/path.hh"
+
+namespace nix {
+
+void showValue(const StorePath & p, std::ostream & os)
+{
+    os << p.to_string();
+}
+
+}
+
+namespace rc {
+using namespace nix;
+
+Gen<StorePathName> Arbitrary<StorePathName>::arbitrary()
+{
+    auto len = *gen::inRange<size_t>(
+        1,
+        StorePath::MaxPathLen - StorePath::HashLen);
+
+    std::string pre;
+    pre.reserve(len);
+
+    for (size_t c = 0; c < len; ++c) {
+        switch (auto i = *gen::inRange<uint8_t>(0, 10 + 2 * 26 + 6)) {
+            case 0 ... 9:
+                pre += '0' + i;
+            case 10 ... 35:
+                pre += 'A' + (i - 10);
+                break;
+            case 36 ... 61:
+                pre += 'a' + (i - 36);
+                break;
+            case 62:
+                pre += '+';
+                break;
+            case 63:
+                pre += '-';
+                break;
+            case 64:
+                // names aren't permitted to start with a period,
+                // so just fall through to the next case here
+                if (c != 0) {
+                    pre += '.';
+                    break;
+                }
+            case 65:
+                pre += '_';
+                break;
+            case 66:
+                pre += '?';
+                break;
+            case 67:
+                pre += '=';
+                break;
+            default:
+                assert(false);
+        }
+    }
+
+    return gen::just(StorePathName {
+        .name = std::move(pre),
+    });
+}
+
+Gen<StorePath> Arbitrary<StorePath>::arbitrary()
+{
+    return gen::just(StorePath {
+        *gen::arbitrary<Hash>(),
+        (*gen::arbitrary<StorePathName>()).name,
+    });
+}
+
+} // namespace rc
diff --git a/src/libstore/tests/path.hh b/tests/unit/libstore-support/tests/path.hh
index 21cb62310..4751b3373 100644
--- a/src/libstore/tests/path.hh
+++ b/tests/unit/libstore-support/tests/path.hh
@@ -11,6 +11,9 @@ struct StorePathName {
     std::string name;
 };
 
+// For rapidcheck
+void showValue(const StorePath & p, std::ostream & os);
+
 }
 
 namespace rc {
diff --git a/src/libstore/tests/derivation.cc b/tests/unit/libstore/derivation.cc
index c360c9707..c360c9707 100644
--- a/src/libstore/tests/derivation.cc
+++ b/tests/unit/libstore/derivation.cc
diff --git a/src/libstore/tests/derived-path.cc b/tests/unit/libstore/derived-path.cc
index 3fa3c0801..c62d79a78 100644
--- a/src/libstore/tests/derived-path.cc
+++ b/tests/unit/libstore/derived-path.cc
@@ -1,64 +1,11 @@
 #include <regex>
 
-#include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 #include <rapidcheck/gtest.h>
 
 #include "tests/derived-path.hh"
 #include "tests/libstore.hh"
 
-namespace rc {
-using namespace nix;
-
-Gen<DerivedPath::Opaque> Arbitrary<DerivedPath::Opaque>::arbitrary()
-{
-    return gen::just(DerivedPath::Opaque {
-        .path = *gen::arbitrary<StorePath>(),
-    });
-}
-
-Gen<SingleDerivedPath::Built> Arbitrary<SingleDerivedPath::Built>::arbitrary()
-{
-    return gen::just(SingleDerivedPath::Built {
-        .drvPath = make_ref<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath>()),
-        .output = (*gen::arbitrary<StorePathName>()).name,
-    });
-}
-
-Gen<DerivedPath::Built> Arbitrary<DerivedPath::Built>::arbitrary()
-{
-    return gen::just(DerivedPath::Built {
-        .drvPath = make_ref<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath>()),
-        .outputs = *gen::arbitrary<OutputsSpec>(),
-    });
-}
-
-Gen<SingleDerivedPath> Arbitrary<SingleDerivedPath>::arbitrary()
-{
-    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<SingleDerivedPath::Raw>)) {
-    case 0:
-        return gen::just<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath::Opaque>());
-    case 1:
-        return gen::just<SingleDerivedPath>(*gen::arbitrary<SingleDerivedPath::Built>());
-    default:
-        assert(false);
-    }
-}
-
-Gen<DerivedPath> Arbitrary<DerivedPath>::arbitrary()
-{
-    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<DerivedPath::Raw>)) {
-    case 0:
-        return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Opaque>());
-    case 1:
-        return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Built>());
-    default:
-        assert(false);
-    }
-}
-
-}
-
 namespace nix {
 
 class DerivedPathTest : public LibStoreTest
diff --git a/src/libstore/tests/downstream-placeholder.cc b/tests/unit/libstore/downstream-placeholder.cc
index fd29530ac..fd29530ac 100644
--- a/src/libstore/tests/downstream-placeholder.cc
+++ b/tests/unit/libstore/downstream-placeholder.cc
diff --git a/tests/unit/libstore/local.mk b/tests/unit/libstore/local.mk
new file mode 100644
index 000000000..fb7385ec1
--- /dev/null
+++ b/tests/unit/libstore/local.mk
@@ -0,0 +1,27 @@
+check: libstore-tests_RUN
+
+programs += libstore-tests
+
+libstore-tests_NAME = libnixstore-tests
+
+libstore-tests_ENV := _NIX_TEST_UNIT_DATA=$(d)/data
+
+libstore-tests_DIR := $(d)
+
+libstore-tests_INSTALL_DIR :=
+
+libstore-tests_SOURCES := $(wildcard $(d)/*.cc)
+
+libstore-tests_EXTRA_INCLUDES = \
+    -I tests/unit/libstore-support \
+    -I tests/unit/libutil-support \
+    -I src/libstore \
+    -I src/libutil
+
+libstore-tests_CXXFLAGS += $(libstore-tests_EXTRA_INCLUDES)
+
+libstore-tests_LIBS = \
+    libstore-test-support libutil-test-support \
+    libstore libutil
+
+libstore-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS)
diff --git a/src/libstore/tests/machines.cc b/tests/unit/libstore/machines.cc
index f51052b14..72b2c3ac6 100644
--- a/src/libstore/tests/machines.cc
+++ b/tests/unit/libstore/machines.cc
@@ -137,7 +137,7 @@ TEST(machines, getMachinesWithIncorrectFormat) {
 }
 
 TEST(machines, getMachinesWithCorrectFileReference) {
-    auto path = absPath("src/libstore/tests/test-data/machines.valid");
+    auto path = absPath("tests/unit/libstore/test-data/machines.valid");
     ASSERT_TRUE(pathExists(path));
 
     settings.builders = std::string("@") + path;
@@ -164,6 +164,6 @@ TEST(machines, getMachinesWithIncorrectFileReference) {
 }
 
 TEST(machines, getMachinesWithCorrectFileReferenceToIncorrectFile) {
-    settings.builders = std::string("@") + absPath("src/libstore/tests/test-data/machines.bad_format");
+    settings.builders = std::string("@") + absPath("tests/unit/libstore/test-data/machines.bad_format");
     EXPECT_THROW(getMachines(), FormatError);
 }
diff --git a/src/libstore/tests/nar-info-disk-cache.cc b/tests/unit/libstore/nar-info-disk-cache.cc
index b4bdb8329..b4bdb8329 100644
--- a/src/libstore/tests/nar-info-disk-cache.cc
+++ b/tests/unit/libstore/nar-info-disk-cache.cc
diff --git a/src/libstore/tests/outputs-spec.cc b/tests/unit/libstore/outputs-spec.cc
index 952945185..456196be1 100644
--- a/src/libstore/tests/outputs-spec.cc
+++ b/tests/unit/libstore/outputs-spec.cc
@@ -1,4 +1,4 @@
-#include "outputs-spec.hh"
+#include "tests/outputs-spec.hh"
 
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
@@ -199,31 +199,6 @@ TEST_JSON(ExtendedOutputsSpec, names, R"(["a","b"])", (ExtendedOutputsSpec::Expl
 
 #undef TEST_JSON
 
-}
-
-namespace rc {
-using namespace nix;
-
-Gen<OutputsSpec> Arbitrary<OutputsSpec>::arbitrary()
-{
-    switch (*gen::inRange<uint8_t>(0, std::variant_size_v<OutputsSpec::Raw>)) {
-    case 0:
-        return gen::just((OutputsSpec) OutputsSpec::All { });
-    case 1:
-        return gen::just((OutputsSpec) OutputsSpec::Names {
-            *gen::nonEmpty(gen::container<StringSet>(gen::map(
-                gen::arbitrary<StorePathName>(),
-                [](StorePathName n) { return n.name; }))),
-        });
-    default:
-        assert(false);
-    }
-}
-
-}
-
-namespace nix {
-
 #ifndef COVERAGE
 
 RC_GTEST_PROP(
diff --git a/src/libstore/tests/path.cc b/tests/unit/libstore/path.cc
index 5a84d646c..30631b5fd 100644
--- a/src/libstore/tests/path.cc
+++ b/tests/unit/libstore/path.cc
@@ -66,79 +66,6 @@ TEST_DO_PARSE(equals_sign, "foo=foo")
 
 #undef TEST_DO_PARSE
 
-// For rapidcheck
-void showValue(const StorePath & p, std::ostream & os) {
-    os << p.to_string();
-}
-
-}
-
-namespace rc {
-using namespace nix;
-
-Gen<StorePathName> Arbitrary<StorePathName>::arbitrary()
-{
-    auto len = *gen::inRange<size_t>(
-        1,
-        StorePath::MaxPathLen - std::string_view { HASH_PART }.size());
-
-    std::string pre;
-    pre.reserve(len);
-
-    for (size_t c = 0; c < len; ++c) {
-        switch (auto i = *gen::inRange<uint8_t>(0, 10 + 2 * 26 + 6)) {
-            case 0 ... 9:
-                pre += '0' + i;
-            case 10 ... 35:
-                pre += 'A' + (i - 10);
-                break;
-            case 36 ... 61:
-                pre += 'a' + (i - 36);
-                break;
-            case 62:
-                pre += '+';
-                break;
-            case 63:
-                pre += '-';
-                break;
-            case 64:
-                // names aren't permitted to start with a period,
-                // so just fall through to the next case here
-                if (c != 0) {
-                    pre += '.';
-                    break;
-                }
-            case 65:
-                pre += '_';
-                break;
-            case 66:
-                pre += '?';
-                break;
-            case 67:
-                pre += '=';
-                break;
-            default:
-                assert(false);
-        }
-    }
-
-    return gen::just(StorePathName {
-        .name = std::move(pre),
-    });
-}
-
-Gen<StorePath> Arbitrary<StorePath>::arbitrary()
-{
-    return gen::just(StorePath {
-        *gen::arbitrary<Hash>(),
-        (*gen::arbitrary<StorePathName>()).name,
-    });
-}
-
-} // namespace rc
-
-namespace nix {
-
 #ifndef COVERAGE
 
 RC_GTEST_FIXTURE_PROP(
diff --git a/src/libstore/tests/references.cc b/tests/unit/libstore/references.cc
index d91d1cedd..d91d1cedd 100644
--- a/src/libstore/tests/references.cc
+++ b/tests/unit/libstore/references.cc
diff --git a/src/libstore/tests/test-data/machines.bad_format b/tests/unit/libstore/test-data/machines.bad_format
index 7255a1216..7255a1216 100644
--- a/src/libstore/tests/test-data/machines.bad_format
+++ b/tests/unit/libstore/test-data/machines.bad_format
diff --git a/src/libstore/tests/test-data/machines.valid b/tests/unit/libstore/test-data/machines.valid
index 1a6c8017c..1a6c8017c 100644
--- a/src/libstore/tests/test-data/machines.valid
+++ b/tests/unit/libstore/test-data/machines.valid
diff --git a/tests/unit/libutil-support/local.mk b/tests/unit/libutil-support/local.mk
new file mode 100644
index 000000000..d085eda4e
--- /dev/null
+++ b/tests/unit/libutil-support/local.mk
@@ -0,0 +1,15 @@
+libraries += libutil-test-support
+
+libutil-test-support_NAME = libnixutil-test-support
+
+libutil-test-support_DIR := $(d)
+
+libutil-test-support_INSTALL_DIR :=
+
+libutil-test-support_SOURCES := $(wildcard $(d)/tests/*.cc)
+
+libutil-test-support_CXXFLAGS += $(libutil-tests_EXTRA_INCLUDES)
+
+libutil-test-support_LIBS = libutil
+
+libutil-test-support_LDFLAGS := -lrapidcheck
diff --git a/tests/unit/libutil-support/tests/hash.cc b/tests/unit/libutil-support/tests/hash.cc
new file mode 100644
index 000000000..577e9890e
--- /dev/null
+++ b/tests/unit/libutil-support/tests/hash.cc
@@ -0,0 +1,20 @@
+#include <regex>
+
+#include <rapidcheck.h>
+
+#include "hash.hh"
+
+#include "tests/hash.hh"
+
+namespace rc {
+using namespace nix;
+
+Gen<Hash> Arbitrary<Hash>::arbitrary()
+{
+    Hash hash(htSHA1);
+    for (size_t i = 0; i < hash.hashSize; ++i)
+        hash.hash[i] = *gen::arbitrary<uint8_t>();
+    return gen::just(hash);
+}
+
+}
diff --git a/src/libutil/tests/hash.hh b/tests/unit/libutil-support/tests/hash.hh
index 1f9fa59ae..1f9fa59ae 100644
--- a/src/libutil/tests/hash.hh
+++ b/tests/unit/libutil-support/tests/hash.hh
diff --git a/src/libutil/tests/canon-path.cc b/tests/unit/libutil/canon-path.cc
index fc94ccc3d..fc94ccc3d 100644
--- a/src/libutil/tests/canon-path.cc
+++ b/tests/unit/libutil/canon-path.cc
diff --git a/src/libutil/tests/chunked-vector.cc b/tests/unit/libutil/chunked-vector.cc
index 868d11f6f..868d11f6f 100644
--- a/src/libutil/tests/chunked-vector.cc
+++ b/tests/unit/libutil/chunked-vector.cc
diff --git a/src/libutil/tests/closure.cc b/tests/unit/libutil/closure.cc
index 7597e7807..7597e7807 100644
--- a/src/libutil/tests/closure.cc
+++ b/tests/unit/libutil/closure.cc
diff --git a/src/libutil/tests/compression.cc b/tests/unit/libutil/compression.cc
index bbbf3500f..bbbf3500f 100644
--- a/src/libutil/tests/compression.cc
+++ b/tests/unit/libutil/compression.cc
diff --git a/src/libutil/tests/config.cc b/tests/unit/libutil/config.cc
index 886e70da5..886e70da5 100644
--- a/src/libutil/tests/config.cc
+++ b/tests/unit/libutil/config.cc
diff --git a/src/libutil/tests/git.cc b/tests/unit/libutil/git.cc
index 5b5715fc2..5b5715fc2 100644
--- a/src/libutil/tests/git.cc
+++ b/tests/unit/libutil/git.cc
diff --git a/src/libutil/tests/hash.cc b/tests/unit/libutil/hash.cc
index e4e928b3b..1f40edc95 100644
--- a/src/libutil/tests/hash.cc
+++ b/tests/unit/libutil/hash.cc
@@ -1,12 +1,8 @@
 #include <regex>
 
-#include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
-#include <rapidcheck/gtest.h>
 
-#include <hash.hh>
-
-#include "tests/hash.hh"
+#include "hash.hh"
 
 namespace nix {
 
@@ -68,7 +64,6 @@ namespace nix {
                 "7ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd"
                 "454d4423643ce80e2a9ac94fa54ca49f");
     }
-
     TEST(hashString, testKnownSHA512Hashes2) {
         // values taken from: https://tools.ietf.org/html/rfc4634
         auto s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu";
@@ -80,16 +75,3 @@ namespace nix {
                 "c7d329eeb6dd26545e96e55b874be909");
     }
 }
-
-namespace rc {
-using namespace nix;
-
-Gen<Hash> Arbitrary<Hash>::arbitrary()
-{
-    Hash hash(htSHA1);
-    for (size_t i = 0; i < hash.hashSize; ++i)
-        hash.hash[i] = *gen::arbitrary<uint8_t>();
-    return gen::just(hash);
-}
-
-}
diff --git a/src/libutil/tests/hilite.cc b/tests/unit/libutil/hilite.cc
index 1ff5980d5..1ff5980d5 100644
--- a/src/libutil/tests/hilite.cc
+++ b/tests/unit/libutil/hilite.cc
diff --git a/tests/unit/libutil/local.mk b/tests/unit/libutil/local.mk
new file mode 100644
index 000000000..6de96c0dc
--- /dev/null
+++ b/tests/unit/libutil/local.mk
@@ -0,0 +1,23 @@
+check: libutil-tests_RUN
+
+programs += libutil-tests
+
+libutil-tests_NAME = libnixutil-tests
+
+libutil-tests_ENV := _NIX_TEST_UNIT_DATA=$(d)/data
+
+libutil-tests_DIR := $(d)
+
+libutil-tests_INSTALL_DIR :=
+
+libutil-tests_SOURCES := $(wildcard $(d)/*.cc)
+
+libutil-tests_EXTRA_INCLUDES = \
+    -I tests/unit/libutil-support \
+    -I src/libutil
+
+libutil-tests_CXXFLAGS += $(libutil-tests_EXTRA_INCLUDES)
+
+libutil-tests_LIBS = libutil-test-support libutil
+
+libutil-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS)
diff --git a/src/libutil/tests/logging.cc b/tests/unit/libutil/logging.cc
index 2ffdc2e9b..2ffdc2e9b 100644
--- a/src/libutil/tests/logging.cc
+++ b/tests/unit/libutil/logging.cc
diff --git a/src/libutil/tests/lru-cache.cc b/tests/unit/libutil/lru-cache.cc
index 091d3d5ed..091d3d5ed 100644
--- a/src/libutil/tests/lru-cache.cc
+++ b/tests/unit/libutil/lru-cache.cc
diff --git a/src/libutil/tests/pool.cc b/tests/unit/libutil/pool.cc
index 127e42dda..127e42dda 100644
--- a/src/libutil/tests/pool.cc
+++ b/tests/unit/libutil/pool.cc
diff --git a/src/libutil/tests/references.cc b/tests/unit/libutil/references.cc
index a517d9aa1..a517d9aa1 100644
--- a/src/libutil/tests/references.cc
+++ b/tests/unit/libutil/references.cc
diff --git a/src/libutil/tests/suggestions.cc b/tests/unit/libutil/suggestions.cc
index 279994abc..279994abc 100644
--- a/src/libutil/tests/suggestions.cc
+++ b/tests/unit/libutil/suggestions.cc
diff --git a/src/libutil/tests/tests.cc b/tests/unit/libutil/tests.cc
index f3c1e8248..f3c1e8248 100644
--- a/src/libutil/tests/tests.cc
+++ b/tests/unit/libutil/tests.cc
diff --git a/src/libutil/tests/url.cc b/tests/unit/libutil/url.cc
index a908631e6..a908631e6 100644
--- a/src/libutil/tests/url.cc
+++ b/tests/unit/libutil/url.cc
diff --git a/src/libutil/tests/xml-writer.cc b/tests/unit/libutil/xml-writer.cc
index adcde25c9..adcde25c9 100644
--- a/src/libutil/tests/xml-writer.cc
+++ b/tests/unit/libutil/xml-writer.cc