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/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/lang/
-/tests/lang/*.out
-/tests/lang/*.out.xml
-/tests/lang/*.err
-/tests/lang/*.ast
+# /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
similarity index 100%
rename from tests/add.sh
rename to tests/functional/add.sh
diff --git a/tests/bad.tar.xz b/tests/functional/bad.tar.xz
similarity index 100%
rename from tests/bad.tar.xz
rename to tests/functional/bad.tar.xz
diff --git a/tests/bash-profile.sh b/tests/functional/bash-profile.sh
similarity index 78%
rename from tests/bash-profile.sh
rename to 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
similarity index 100%
rename from tests/big-derivation-attr.nix
rename to tests/functional/big-derivation-attr.nix
diff --git a/tests/binary-cache-build-remote.sh b/tests/functional/binary-cache-build-remote.sh
similarity index 100%
rename from tests/binary-cache-build-remote.sh
rename to tests/functional/binary-cache-build-remote.sh
diff --git a/tests/binary-cache.sh b/tests/functional/binary-cache.sh
similarity index 100%
rename from tests/binary-cache.sh
rename to tests/functional/binary-cache.sh
diff --git a/tests/brotli.sh b/tests/functional/brotli.sh
similarity index 100%
rename from tests/brotli.sh
rename to tests/functional/brotli.sh
diff --git a/tests/build-delete.sh b/tests/functional/build-delete.sh
similarity index 100%
rename from tests/build-delete.sh
rename to tests/functional/build-delete.sh
diff --git a/tests/build-dry.sh b/tests/functional/build-dry.sh
similarity index 100%
rename from tests/build-dry.sh
rename to tests/functional/build-dry.sh
diff --git a/tests/build-hook-ca-fixed.nix b/tests/functional/build-hook-ca-fixed.nix
similarity index 100%
rename from tests/build-hook-ca-fixed.nix
rename to tests/functional/build-hook-ca-fixed.nix
diff --git a/tests/build-hook-ca-floating.nix b/tests/functional/build-hook-ca-floating.nix
similarity index 100%
rename from tests/build-hook-ca-floating.nix
rename to tests/functional/build-hook-ca-floating.nix
diff --git a/tests/build-hook.nix b/tests/functional/build-hook.nix
similarity index 100%
rename from tests/build-hook.nix
rename to tests/functional/build-hook.nix
diff --git a/tests/build-remote-content-addressed-fixed.sh b/tests/functional/build-remote-content-addressed-fixed.sh
similarity index 100%
rename from tests/build-remote-content-addressed-fixed.sh
rename to 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
similarity index 100%
rename from tests/build-remote-content-addressed-floating.sh
rename to 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
similarity index 100%
rename from tests/build-remote-input-addressed.sh
rename to tests/functional/build-remote-input-addressed.sh
diff --git a/tests/build-remote-trustless-after.sh b/tests/functional/build-remote-trustless-after.sh
similarity index 100%
rename from tests/build-remote-trustless-after.sh
rename to 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
similarity index 100%
rename from tests/build-remote-trustless-should-fail-0.sh
rename to 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
similarity index 100%
rename from tests/build-remote-trustless-should-pass-0.sh
rename to 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
similarity index 100%
rename from tests/build-remote-trustless-should-pass-1.sh
rename to 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
similarity index 100%
rename from tests/build-remote-trustless-should-pass-2.sh
rename to 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
similarity index 100%
rename from tests/build-remote-trustless-should-pass-3.sh
rename to tests/functional/build-remote-trustless-should-pass-3.sh
diff --git a/tests/build-remote-trustless.sh b/tests/functional/build-remote-trustless.sh
similarity index 82%
rename from tests/build-remote-trustless.sh
rename to 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
similarity index 100%
rename from tests/build-remote.sh
rename to tests/functional/build-remote.sh
diff --git a/tests/build.sh b/tests/functional/build.sh
similarity index 100%
rename from tests/build.sh
rename to tests/functional/build.sh
diff --git a/tests/ca-shell.nix b/tests/functional/ca-shell.nix
similarity index 100%
rename from tests/ca-shell.nix
rename to tests/functional/ca-shell.nix
diff --git a/tests/ca/build-cache.sh b/tests/functional/ca/build-cache.sh
similarity index 100%
rename from tests/ca/build-cache.sh
rename to tests/functional/ca/build-cache.sh
diff --git a/tests/ca/build-dry.sh b/tests/functional/ca/build-dry.sh
similarity index 100%
rename from tests/ca/build-dry.sh
rename to 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
similarity index 100%
rename from tests/ca/build-with-garbage-path.sh
rename to tests/functional/ca/build-with-garbage-path.sh
diff --git a/tests/ca/build.sh b/tests/functional/ca/build.sh
similarity index 100%
rename from tests/ca/build.sh
rename to tests/functional/ca/build.sh
diff --git a/tests/ca/common.sh b/tests/functional/ca/common.sh
similarity index 100%
rename from tests/ca/common.sh
rename to tests/functional/ca/common.sh
diff --git a/tests/ca/concurrent-builds.sh b/tests/functional/ca/concurrent-builds.sh
similarity index 100%
rename from tests/ca/concurrent-builds.sh
rename to tests/functional/ca/concurrent-builds.sh
diff --git a/tests/ca/config.nix.in b/tests/functional/ca/config.nix.in
similarity index 100%
rename from tests/ca/config.nix.in
rename to tests/functional/ca/config.nix.in
diff --git a/tests/ca/content-addressed.nix b/tests/functional/ca/content-addressed.nix
similarity index 100%
rename from tests/ca/content-addressed.nix
rename to tests/functional/ca/content-addressed.nix
diff --git a/tests/ca/derivation-json.sh b/tests/functional/ca/derivation-json.sh
similarity index 100%
rename from tests/ca/derivation-json.sh
rename to 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
similarity index 100%
rename from tests/ca/duplicate-realisation-in-closure.sh
rename to tests/functional/ca/duplicate-realisation-in-closure.sh
diff --git a/tests/ca/flake.nix b/tests/functional/ca/flake.nix
similarity index 100%
rename from tests/ca/flake.nix
rename to tests/functional/ca/flake.nix
diff --git a/tests/ca/gc.sh b/tests/functional/ca/gc.sh
similarity index 100%
rename from tests/ca/gc.sh
rename to tests/functional/ca/gc.sh
diff --git a/tests/ca/import-derivation.sh b/tests/functional/ca/import-derivation.sh
similarity index 100%
rename from tests/ca/import-derivation.sh
rename to tests/functional/ca/import-derivation.sh
diff --git a/tests/ca/local.mk b/tests/functional/ca/local.mk
similarity index 94%
rename from tests/ca/local.mk
rename to 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
similarity index 100%
rename from tests/ca/new-build-cmd.sh
rename to tests/functional/ca/new-build-cmd.sh
diff --git a/tests/ca/nix-copy.sh b/tests/functional/ca/nix-copy.sh
similarity index 100%
rename from tests/ca/nix-copy.sh
rename to tests/functional/ca/nix-copy.sh
diff --git a/tests/ca/nix-run.sh b/tests/functional/ca/nix-run.sh
similarity index 100%
rename from tests/ca/nix-run.sh
rename to tests/functional/ca/nix-run.sh
diff --git a/tests/ca/nix-shell.sh b/tests/functional/ca/nix-shell.sh
similarity index 100%
rename from tests/ca/nix-shell.sh
rename to tests/functional/ca/nix-shell.sh
diff --git a/tests/ca/nondeterministic.nix b/tests/functional/ca/nondeterministic.nix
similarity index 100%
rename from tests/ca/nondeterministic.nix
rename to tests/functional/ca/nondeterministic.nix
diff --git a/tests/ca/post-hook.sh b/tests/functional/ca/post-hook.sh
similarity index 100%
rename from tests/ca/post-hook.sh
rename to tests/functional/ca/post-hook.sh
diff --git a/tests/ca/racy.nix b/tests/functional/ca/racy.nix
similarity index 100%
rename from tests/ca/racy.nix
rename to tests/functional/ca/racy.nix
diff --git a/tests/ca/recursive.sh b/tests/functional/ca/recursive.sh
similarity index 100%
rename from tests/ca/recursive.sh
rename to tests/functional/ca/recursive.sh
diff --git a/tests/ca/repl.sh b/tests/functional/ca/repl.sh
similarity index 100%
rename from tests/ca/repl.sh
rename to tests/functional/ca/repl.sh
diff --git a/tests/ca/selfref-gc.sh b/tests/functional/ca/selfref-gc.sh
similarity index 100%
rename from tests/ca/selfref-gc.sh
rename to tests/functional/ca/selfref-gc.sh
diff --git a/tests/ca/signatures.sh b/tests/functional/ca/signatures.sh
similarity index 100%
rename from tests/ca/signatures.sh
rename to tests/functional/ca/signatures.sh
diff --git a/tests/ca/substitute.sh b/tests/functional/ca/substitute.sh
similarity index 100%
rename from tests/ca/substitute.sh
rename to tests/functional/ca/substitute.sh
diff --git a/tests/ca/why-depends.sh b/tests/functional/ca/why-depends.sh
similarity index 100%
rename from tests/ca/why-depends.sh
rename to tests/functional/ca/why-depends.sh
diff --git a/tests/case-hack.sh b/tests/functional/case-hack.sh
similarity index 100%
rename from tests/case-hack.sh
rename to tests/functional/case-hack.sh
diff --git a/tests/case.nar b/tests/functional/case.nar
similarity index 100%
rename from tests/case.nar
rename to tests/functional/case.nar
diff --git a/tests/check-refs.nix b/tests/functional/check-refs.nix
similarity index 100%
rename from tests/check-refs.nix
rename to tests/functional/check-refs.nix
diff --git a/tests/check-refs.sh b/tests/functional/check-refs.sh
similarity index 100%
rename from tests/check-refs.sh
rename to tests/functional/check-refs.sh
diff --git a/tests/check-reqs.nix b/tests/functional/check-reqs.nix
similarity index 100%
rename from tests/check-reqs.nix
rename to tests/functional/check-reqs.nix
diff --git a/tests/check-reqs.sh b/tests/functional/check-reqs.sh
similarity index 100%
rename from tests/check-reqs.sh
rename to tests/functional/check-reqs.sh
diff --git a/tests/check.nix b/tests/functional/check.nix
similarity index 100%
rename from tests/check.nix
rename to tests/functional/check.nix
diff --git a/tests/check.sh b/tests/functional/check.sh
similarity index 100%
rename from tests/check.sh
rename to tests/functional/check.sh
diff --git a/tests/common.sh b/tests/functional/common.sh
similarity index 100%
rename from tests/common.sh
rename to tests/functional/common.sh
diff --git a/tests/common/vars-and-functions.sh.in b/tests/functional/common/vars-and-functions.sh.in
similarity index 99%
rename from tests/common/vars-and-functions.sh.in
rename to 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
similarity index 100%
rename from tests/completions.sh
rename to tests/functional/completions.sh
diff --git a/tests/compression-levels.sh b/tests/functional/compression-levels.sh
similarity index 100%
rename from tests/compression-levels.sh
rename to tests/functional/compression-levels.sh
diff --git a/tests/compute-levels.sh b/tests/functional/compute-levels.sh
similarity index 100%
rename from tests/compute-levels.sh
rename to tests/functional/compute-levels.sh
diff --git a/tests/config.nix.in b/tests/functional/config.nix.in
similarity index 100%
rename from tests/config.nix.in
rename to tests/functional/config.nix.in
diff --git a/tests/config.sh b/tests/functional/config.sh
similarity index 100%
rename from tests/config.sh
rename to tests/functional/config.sh
diff --git a/tests/config/nix-with-substituters.conf b/tests/functional/config/nix-with-substituters.conf
similarity index 100%
rename from tests/config/nix-with-substituters.conf
rename to tests/functional/config/nix-with-substituters.conf
diff --git a/tests/db-migration.sh b/tests/functional/db-migration.sh
similarity index 100%
rename from tests/db-migration.sh
rename to tests/functional/db-migration.sh
diff --git a/tests/dependencies.builder0.sh b/tests/functional/dependencies.builder0.sh
similarity index 100%
rename from tests/dependencies.builder0.sh
rename to tests/functional/dependencies.builder0.sh
diff --git a/tests/dependencies.nix b/tests/functional/dependencies.nix
similarity index 100%
rename from tests/dependencies.nix
rename to tests/functional/dependencies.nix
diff --git a/tests/dependencies.sh b/tests/functional/dependencies.sh
similarity index 100%
rename from tests/dependencies.sh
rename to tests/functional/dependencies.sh
diff --git a/tests/derivation-json.sh b/tests/functional/derivation-json.sh
similarity index 100%
rename from tests/derivation-json.sh
rename to tests/functional/derivation-json.sh
diff --git a/tests/dummy b/tests/functional/dummy
similarity index 100%
rename from tests/dummy
rename to tests/functional/dummy
diff --git a/tests/dump-db.sh b/tests/functional/dump-db.sh
similarity index 100%
rename from tests/dump-db.sh
rename to tests/functional/dump-db.sh
diff --git a/tests/dyn-drv/build-built-drv.sh b/tests/functional/dyn-drv/build-built-drv.sh
similarity index 100%
rename from tests/dyn-drv/build-built-drv.sh
rename to tests/functional/dyn-drv/build-built-drv.sh
diff --git a/tests/dyn-drv/common.sh b/tests/functional/dyn-drv/common.sh
similarity index 100%
rename from tests/dyn-drv/common.sh
rename to tests/functional/dyn-drv/common.sh
diff --git a/tests/dyn-drv/config.nix.in b/tests/functional/dyn-drv/config.nix.in
similarity index 100%
rename from tests/dyn-drv/config.nix.in
rename to 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
similarity index 100%
rename from tests/dyn-drv/dep-built-drv.sh
rename to 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
similarity index 100%
rename from tests/dyn-drv/eval-outputOf.sh
rename to tests/functional/dyn-drv/eval-outputOf.sh
diff --git a/tests/dyn-drv/local.mk b/tests/functional/dyn-drv/local.mk
similarity index 87%
rename from tests/dyn-drv/local.mk
rename to 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
similarity index 100%
rename from tests/dyn-drv/old-daemon-error-hack.nix
rename to 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
similarity index 100%
rename from tests/dyn-drv/old-daemon-error-hack.sh
rename to 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
similarity index 100%
rename from tests/dyn-drv/recursive-mod-json.nix
rename to 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
similarity index 100%
rename from tests/dyn-drv/recursive-mod-json.sh
rename to 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
similarity index 100%
rename from tests/dyn-drv/text-hashed-output.nix
rename to 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
similarity index 100%
rename from tests/dyn-drv/text-hashed-output.sh
rename to tests/functional/dyn-drv/text-hashed-output.sh
diff --git a/tests/eval-store.sh b/tests/functional/eval-store.sh
similarity index 100%
rename from tests/eval-store.sh
rename to tests/functional/eval-store.sh
diff --git a/tests/eval.nix b/tests/functional/eval.nix
similarity index 100%
rename from tests/eval.nix
rename to tests/functional/eval.nix
diff --git a/tests/eval.sh b/tests/functional/eval.sh
similarity index 100%
rename from tests/eval.sh
rename to tests/functional/eval.sh
diff --git a/tests/experimental-features.sh b/tests/functional/experimental-features.sh
similarity index 100%
rename from tests/experimental-features.sh
rename to tests/functional/experimental-features.sh
diff --git a/tests/export-graph.nix b/tests/functional/export-graph.nix
similarity index 100%
rename from tests/export-graph.nix
rename to tests/functional/export-graph.nix
diff --git a/tests/export-graph.sh b/tests/functional/export-graph.sh
similarity index 100%
rename from tests/export-graph.sh
rename to tests/functional/export-graph.sh
diff --git a/tests/export.sh b/tests/functional/export.sh
similarity index 100%
rename from tests/export.sh
rename to tests/functional/export.sh
diff --git a/tests/failing.nix b/tests/functional/failing.nix
similarity index 100%
rename from tests/failing.nix
rename to tests/functional/failing.nix
diff --git a/tests/fetchClosure.sh b/tests/functional/fetchClosure.sh
similarity index 100%
rename from tests/fetchClosure.sh
rename to tests/functional/fetchClosure.sh
diff --git a/tests/fetchGit.sh b/tests/functional/fetchGit.sh
similarity index 100%
rename from tests/fetchGit.sh
rename to tests/functional/fetchGit.sh
diff --git a/tests/fetchGitRefs.sh b/tests/functional/fetchGitRefs.sh
similarity index 100%
rename from tests/fetchGitRefs.sh
rename to tests/functional/fetchGitRefs.sh
diff --git a/tests/fetchGitSubmodules.sh b/tests/functional/fetchGitSubmodules.sh
similarity index 100%
rename from tests/fetchGitSubmodules.sh
rename to tests/functional/fetchGitSubmodules.sh
diff --git a/tests/fetchMercurial.sh b/tests/functional/fetchMercurial.sh
similarity index 100%
rename from tests/fetchMercurial.sh
rename to tests/functional/fetchMercurial.sh
diff --git a/tests/fetchPath.sh b/tests/functional/fetchPath.sh
similarity index 100%
rename from tests/fetchPath.sh
rename to tests/functional/fetchPath.sh
diff --git a/tests/fetchTree-file.sh b/tests/functional/fetchTree-file.sh
similarity index 100%
rename from tests/fetchTree-file.sh
rename to tests/functional/fetchTree-file.sh
diff --git a/tests/fetchurl.sh b/tests/functional/fetchurl.sh
similarity index 100%
rename from tests/fetchurl.sh
rename to tests/functional/fetchurl.sh
diff --git a/tests/filter-source.nix b/tests/functional/filter-source.nix
similarity index 100%
rename from tests/filter-source.nix
rename to tests/functional/filter-source.nix
diff --git a/tests/filter-source.sh b/tests/functional/filter-source.sh
similarity index 100%
rename from tests/filter-source.sh
rename to tests/functional/filter-source.sh
diff --git a/tests/fixed.builder1.sh b/tests/functional/fixed.builder1.sh
similarity index 100%
rename from tests/fixed.builder1.sh
rename to tests/functional/fixed.builder1.sh
diff --git a/tests/fixed.builder2.sh b/tests/functional/fixed.builder2.sh
similarity index 100%
rename from tests/fixed.builder2.sh
rename to tests/functional/fixed.builder2.sh
diff --git a/tests/fixed.nix b/tests/functional/fixed.nix
similarity index 100%
rename from tests/fixed.nix
rename to tests/functional/fixed.nix
diff --git a/tests/fixed.sh b/tests/functional/fixed.sh
similarity index 100%
rename from tests/fixed.sh
rename to tests/functional/fixed.sh
diff --git a/tests/flakes/absolute-paths.sh b/tests/functional/flakes/absolute-paths.sh
similarity index 100%
rename from tests/flakes/absolute-paths.sh
rename to tests/functional/flakes/absolute-paths.sh
diff --git a/tests/flakes/build-paths.sh b/tests/functional/flakes/build-paths.sh
similarity index 100%
rename from tests/flakes/build-paths.sh
rename to tests/functional/flakes/build-paths.sh
diff --git a/tests/flakes/bundle.sh b/tests/functional/flakes/bundle.sh
similarity index 100%
rename from tests/flakes/bundle.sh
rename to tests/functional/flakes/bundle.sh
diff --git a/tests/flakes/check.sh b/tests/functional/flakes/check.sh
similarity index 100%
rename from tests/flakes/check.sh
rename to tests/functional/flakes/check.sh
diff --git a/tests/flakes/circular.sh b/tests/functional/flakes/circular.sh
similarity index 100%
rename from tests/flakes/circular.sh
rename to tests/functional/flakes/circular.sh
diff --git a/tests/flakes/common.sh b/tests/functional/flakes/common.sh
similarity index 100%
rename from tests/flakes/common.sh
rename to tests/functional/flakes/common.sh
diff --git a/tests/flakes/config.sh b/tests/functional/flakes/config.sh
similarity index 100%
rename from tests/flakes/config.sh
rename to tests/functional/flakes/config.sh
diff --git a/tests/flakes/flake-in-submodule.sh b/tests/functional/flakes/flake-in-submodule.sh
similarity index 100%
rename from tests/flakes/flake-in-submodule.sh
rename to tests/functional/flakes/flake-in-submodule.sh
diff --git a/tests/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
similarity index 100%
rename from tests/flakes/flakes.sh
rename to tests/functional/flakes/flakes.sh
diff --git a/tests/flakes/follow-paths.sh b/tests/functional/flakes/follow-paths.sh
similarity index 100%
rename from tests/flakes/follow-paths.sh
rename to tests/functional/flakes/follow-paths.sh
diff --git a/tests/flakes/init.sh b/tests/functional/flakes/init.sh
similarity index 100%
rename from tests/flakes/init.sh
rename to tests/functional/flakes/init.sh
diff --git a/tests/flakes/inputs.sh b/tests/functional/flakes/inputs.sh
similarity index 100%
rename from tests/flakes/inputs.sh
rename to tests/functional/flakes/inputs.sh
diff --git a/tests/flakes/mercurial.sh b/tests/functional/flakes/mercurial.sh
similarity index 100%
rename from tests/flakes/mercurial.sh
rename to tests/functional/flakes/mercurial.sh
diff --git a/tests/flakes/run.sh b/tests/functional/flakes/run.sh
similarity index 100%
rename from tests/flakes/run.sh
rename to tests/functional/flakes/run.sh
diff --git a/tests/flakes/search-root.sh b/tests/functional/flakes/search-root.sh
similarity index 100%
rename from tests/flakes/search-root.sh
rename to tests/functional/flakes/search-root.sh
diff --git a/tests/flakes/show.sh b/tests/functional/flakes/show.sh
similarity index 100%
rename from tests/flakes/show.sh
rename to tests/functional/flakes/show.sh
diff --git a/tests/flakes/unlocked-override.sh b/tests/functional/flakes/unlocked-override.sh
similarity index 100%
rename from tests/flakes/unlocked-override.sh
rename to tests/functional/flakes/unlocked-override.sh
diff --git a/tests/fmt.sh b/tests/functional/fmt.sh
similarity index 100%
rename from tests/fmt.sh
rename to tests/functional/fmt.sh
diff --git a/tests/fmt.simple.sh b/tests/functional/fmt.simple.sh
similarity index 100%
rename from tests/fmt.simple.sh
rename to tests/functional/fmt.simple.sh
diff --git a/tests/function-trace.sh b/tests/functional/function-trace.sh
similarity index 100%
rename from tests/function-trace.sh
rename to tests/functional/function-trace.sh
diff --git a/tests/gc-auto.sh b/tests/functional/gc-auto.sh
similarity index 100%
rename from tests/gc-auto.sh
rename to tests/functional/gc-auto.sh
diff --git a/tests/gc-concurrent.builder.sh b/tests/functional/gc-concurrent.builder.sh
similarity index 100%
rename from tests/gc-concurrent.builder.sh
rename to tests/functional/gc-concurrent.builder.sh
diff --git a/tests/gc-concurrent.nix b/tests/functional/gc-concurrent.nix
similarity index 100%
rename from tests/gc-concurrent.nix
rename to tests/functional/gc-concurrent.nix
diff --git a/tests/gc-concurrent.sh b/tests/functional/gc-concurrent.sh
similarity index 100%
rename from tests/gc-concurrent.sh
rename to tests/functional/gc-concurrent.sh
diff --git a/tests/gc-concurrent2.builder.sh b/tests/functional/gc-concurrent2.builder.sh
similarity index 100%
rename from tests/gc-concurrent2.builder.sh
rename to tests/functional/gc-concurrent2.builder.sh
diff --git a/tests/gc-non-blocking.sh b/tests/functional/gc-non-blocking.sh
similarity index 100%
rename from tests/gc-non-blocking.sh
rename to tests/functional/gc-non-blocking.sh
diff --git a/tests/gc-runtime.nix b/tests/functional/gc-runtime.nix
similarity index 100%
rename from tests/gc-runtime.nix
rename to tests/functional/gc-runtime.nix
diff --git a/tests/gc-runtime.sh b/tests/functional/gc-runtime.sh
similarity index 100%
rename from tests/gc-runtime.sh
rename to tests/functional/gc-runtime.sh
diff --git a/tests/gc.sh b/tests/functional/gc.sh
similarity index 100%
rename from tests/gc.sh
rename to tests/functional/gc.sh
diff --git a/tests/hash-check.nix b/tests/functional/hash-check.nix
similarity index 100%
rename from tests/hash-check.nix
rename to tests/functional/hash-check.nix
diff --git a/tests/hash.sh b/tests/functional/hash.sh
similarity index 100%
rename from tests/hash.sh
rename to tests/functional/hash.sh
diff --git a/tests/hermetic.nix b/tests/functional/hermetic.nix
similarity index 100%
rename from tests/hermetic.nix
rename to tests/functional/hermetic.nix
diff --git a/tests/import-derivation.nix b/tests/functional/import-derivation.nix
similarity index 100%
rename from tests/import-derivation.nix
rename to tests/functional/import-derivation.nix
diff --git a/tests/import-derivation.sh b/tests/functional/import-derivation.sh
similarity index 100%
rename from tests/import-derivation.sh
rename to tests/functional/import-derivation.sh
diff --git a/tests/impure-derivations.nix b/tests/functional/impure-derivations.nix
similarity index 100%
rename from tests/impure-derivations.nix
rename to tests/functional/impure-derivations.nix
diff --git a/tests/impure-derivations.sh b/tests/functional/impure-derivations.sh
similarity index 100%
rename from tests/impure-derivations.sh
rename to tests/functional/impure-derivations.sh
diff --git a/tests/init.sh b/tests/functional/init.sh
similarity index 100%
rename from tests/init.sh
rename to tests/functional/init.sh
diff --git a/tests/install-darwin.sh b/tests/functional/install-darwin.sh
similarity index 100%
rename from tests/install-darwin.sh
rename to tests/functional/install-darwin.sh
diff --git a/tests/lang-test-infra.sh b/tests/functional/lang-test-infra.sh
similarity index 100%
rename from tests/lang-test-infra.sh
rename to tests/functional/lang-test-infra.sh
diff --git a/tests/lang.sh b/tests/functional/lang.sh
similarity index 98%
rename from tests/lang.sh
rename to 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
similarity index 100%
rename from tests/lang/binary-data
rename to tests/functional/lang/binary-data
diff --git a/tests/lang/data b/tests/functional/lang/data
similarity index 100%
rename from tests/lang/data
rename to tests/functional/lang/data
diff --git a/tests/lang/dir1/a.nix b/tests/functional/lang/dir1/a.nix
similarity index 100%
rename from tests/lang/dir1/a.nix
rename to tests/functional/lang/dir1/a.nix
diff --git a/tests/lang/dir2/a.nix b/tests/functional/lang/dir2/a.nix
similarity index 100%
rename from tests/lang/dir2/a.nix
rename to tests/functional/lang/dir2/a.nix
diff --git a/tests/lang/dir2/b.nix b/tests/functional/lang/dir2/b.nix
similarity index 100%
rename from tests/lang/dir2/b.nix
rename to tests/functional/lang/dir2/b.nix
diff --git a/tests/lang/dir3/a.nix b/tests/functional/lang/dir3/a.nix
similarity index 100%
rename from tests/lang/dir3/a.nix
rename to tests/functional/lang/dir3/a.nix
diff --git a/tests/lang/dir3/b.nix b/tests/functional/lang/dir3/b.nix
similarity index 100%
rename from tests/lang/dir3/b.nix
rename to tests/functional/lang/dir3/b.nix
diff --git a/tests/lang/dir3/c.nix b/tests/functional/lang/dir3/c.nix
similarity index 100%
rename from tests/lang/dir3/c.nix
rename to tests/functional/lang/dir3/c.nix
diff --git a/tests/lang/dir4/a.nix b/tests/functional/lang/dir4/a.nix
similarity index 100%
rename from tests/lang/dir4/a.nix
rename to tests/functional/lang/dir4/a.nix
diff --git a/tests/lang/dir4/c.nix b/tests/functional/lang/dir4/c.nix
similarity index 100%
rename from tests/lang/dir4/c.nix
rename to tests/functional/lang/dir4/c.nix
diff --git a/tests/lang/empty.exp b/tests/functional/lang/empty.exp
similarity index 100%
rename from tests/lang/empty.exp
rename to tests/functional/lang/empty.exp
diff --git a/tests/lang/eval-fail-abort.err.exp b/tests/functional/lang/eval-fail-abort.err.exp
similarity index 100%
rename from tests/lang/eval-fail-abort.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-abort.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-antiquoted-path.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-assert.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-assert.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-antiquote-1.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-antiquote-2.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-antiquote-3.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-string-interpolation-1.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-string-interpolation-1.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-string-interpolation-2.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-string-interpolation-2.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-string-interpolation-3.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-bad-string-interpolation-3.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-blackhole.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-blackhole.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-deepseq.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-deepseq.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-dup-dynamic-attrs.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-dup-dynamic-attrs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-foldlStrict-strict-op-application.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-fromTOML-timestamps.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-fromTOML-timestamps.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-hashfile-missing.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-hashfile-missing.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-list.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-list.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-missing-arg.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-missing-arg.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-nonexist-path.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-nonexist-path.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-path-slash.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-path-slash.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-recursion.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-recursion.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-remove.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-remove.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-scope-5.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-scope-5.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-seq.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-seq.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-set-override.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-set-override.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-set.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-set.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-substring.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-substring.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-to-path.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-to-path.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-toJSON.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-toJSON.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-undeclared-arg.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-fail-undeclared-arg.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-any-all.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-any-all.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-arithmetic.exp
rename to tests/functional/lang/eval-okay-arithmetic.exp
diff --git a/tests/lang/eval-okay-arithmetic.nix b/tests/functional/lang/eval-okay-arithmetic.nix
similarity index 100%
rename from tests/lang/eval-okay-arithmetic.nix
rename to tests/functional/lang/eval-okay-arithmetic.nix
diff --git a/tests/lang/eval-okay-attrnames.exp b/tests/functional/lang/eval-okay-attrnames.exp
similarity index 100%
rename from tests/lang/eval-okay-attrnames.exp
rename to tests/functional/lang/eval-okay-attrnames.exp
diff --git a/tests/lang/eval-okay-attrnames.nix b/tests/functional/lang/eval-okay-attrnames.nix
similarity index 100%
rename from tests/lang/eval-okay-attrnames.nix
rename to tests/functional/lang/eval-okay-attrnames.nix
diff --git a/tests/lang/eval-okay-attrs.exp b/tests/functional/lang/eval-okay-attrs.exp
similarity index 100%
rename from tests/lang/eval-okay-attrs.exp
rename to tests/functional/lang/eval-okay-attrs.exp
diff --git a/tests/lang/eval-okay-attrs.nix b/tests/functional/lang/eval-okay-attrs.nix
similarity index 100%
rename from tests/lang/eval-okay-attrs.nix
rename to tests/functional/lang/eval-okay-attrs.nix
diff --git a/tests/lang/eval-okay-attrs2.exp b/tests/functional/lang/eval-okay-attrs2.exp
similarity index 100%
rename from tests/lang/eval-okay-attrs2.exp
rename to tests/functional/lang/eval-okay-attrs2.exp
diff --git a/tests/lang/eval-okay-attrs2.nix b/tests/functional/lang/eval-okay-attrs2.nix
similarity index 100%
rename from tests/lang/eval-okay-attrs2.nix
rename to tests/functional/lang/eval-okay-attrs2.nix
diff --git a/tests/lang/eval-okay-attrs3.exp b/tests/functional/lang/eval-okay-attrs3.exp
similarity index 100%
rename from tests/lang/eval-okay-attrs3.exp
rename to tests/functional/lang/eval-okay-attrs3.exp
diff --git a/tests/lang/eval-okay-attrs3.nix b/tests/functional/lang/eval-okay-attrs3.nix
similarity index 100%
rename from tests/lang/eval-okay-attrs3.nix
rename to tests/functional/lang/eval-okay-attrs3.nix
diff --git a/tests/lang/eval-okay-attrs4.exp b/tests/functional/lang/eval-okay-attrs4.exp
similarity index 100%
rename from tests/lang/eval-okay-attrs4.exp
rename to tests/functional/lang/eval-okay-attrs4.exp
diff --git a/tests/lang/eval-okay-attrs4.nix b/tests/functional/lang/eval-okay-attrs4.nix
similarity index 100%
rename from tests/lang/eval-okay-attrs4.nix
rename to tests/functional/lang/eval-okay-attrs4.nix
diff --git a/tests/lang/eval-okay-attrs5.exp b/tests/functional/lang/eval-okay-attrs5.exp
similarity index 100%
rename from tests/lang/eval-okay-attrs5.exp
rename to tests/functional/lang/eval-okay-attrs5.exp
diff --git a/tests/lang/eval-okay-attrs5.nix b/tests/functional/lang/eval-okay-attrs5.nix
similarity index 100%
rename from tests/lang/eval-okay-attrs5.nix
rename to tests/functional/lang/eval-okay-attrs5.nix
diff --git a/tests/lang/eval-okay-attrs6.exp b/tests/functional/lang/eval-okay-attrs6.exp
similarity index 100%
rename from tests/lang/eval-okay-attrs6.exp
rename to tests/functional/lang/eval-okay-attrs6.exp
diff --git a/tests/lang/eval-okay-attrs6.nix b/tests/functional/lang/eval-okay-attrs6.nix
similarity index 100%
rename from tests/lang/eval-okay-attrs6.nix
rename to tests/functional/lang/eval-okay-attrs6.nix
diff --git a/tests/lang/eval-okay-autoargs.exp b/tests/functional/lang/eval-okay-autoargs.exp
similarity index 100%
rename from tests/lang/eval-okay-autoargs.exp
rename to tests/functional/lang/eval-okay-autoargs.exp
diff --git a/tests/lang/eval-okay-autoargs.flags b/tests/functional/lang/eval-okay-autoargs.flags
similarity index 100%
rename from tests/lang/eval-okay-autoargs.flags
rename to tests/functional/lang/eval-okay-autoargs.flags
diff --git a/tests/lang/eval-okay-autoargs.nix b/tests/functional/lang/eval-okay-autoargs.nix
similarity index 100%
rename from tests/lang/eval-okay-autoargs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-backslash-newline-1.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-backslash-newline-1.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-backslash-newline-2.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-backslash-newline-2.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-builtins-add.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-builtins-add.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-builtins.exp
rename to tests/functional/lang/eval-okay-builtins.exp
diff --git a/tests/lang/eval-okay-builtins.nix b/tests/functional/lang/eval-okay-builtins.nix
similarity index 100%
rename from tests/lang/eval-okay-builtins.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-callable-attrs.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-callable-attrs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-catattrs.exp
rename to tests/functional/lang/eval-okay-catattrs.exp
diff --git a/tests/lang/eval-okay-catattrs.nix b/tests/functional/lang/eval-okay-catattrs.nix
similarity index 100%
rename from tests/lang/eval-okay-catattrs.nix
rename to tests/functional/lang/eval-okay-catattrs.nix
diff --git a/tests/lang/eval-okay-closure.exp b/tests/functional/lang/eval-okay-closure.exp
similarity index 100%
rename from tests/lang/eval-okay-closure.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-closure.exp.xml
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-closure.nix
rename to tests/functional/lang/eval-okay-closure.nix
diff --git a/tests/lang/eval-okay-comments.exp b/tests/functional/lang/eval-okay-comments.exp
similarity index 100%
rename from tests/lang/eval-okay-comments.exp
rename to tests/functional/lang/eval-okay-comments.exp
diff --git a/tests/lang/eval-okay-comments.nix b/tests/functional/lang/eval-okay-comments.nix
similarity index 100%
rename from tests/lang/eval-okay-comments.nix
rename to tests/functional/lang/eval-okay-comments.nix
diff --git a/tests/lang/eval-okay-concat.exp b/tests/functional/lang/eval-okay-concat.exp
similarity index 100%
rename from tests/lang/eval-okay-concat.exp
rename to tests/functional/lang/eval-okay-concat.exp
diff --git a/tests/lang/eval-okay-concat.nix b/tests/functional/lang/eval-okay-concat.nix
similarity index 100%
rename from tests/lang/eval-okay-concat.nix
rename to tests/functional/lang/eval-okay-concat.nix
diff --git a/tests/lang/eval-okay-concatmap.exp b/tests/functional/lang/eval-okay-concatmap.exp
similarity index 100%
rename from tests/lang/eval-okay-concatmap.exp
rename to tests/functional/lang/eval-okay-concatmap.exp
diff --git a/tests/lang/eval-okay-concatmap.nix b/tests/functional/lang/eval-okay-concatmap.nix
similarity index 100%
rename from tests/lang/eval-okay-concatmap.nix
rename to tests/functional/lang/eval-okay-concatmap.nix
diff --git a/tests/lang/eval-okay-concatstringssep.exp b/tests/functional/lang/eval-okay-concatstringssep.exp
similarity index 100%
rename from tests/lang/eval-okay-concatstringssep.exp
rename to tests/functional/lang/eval-okay-concatstringssep.exp
diff --git a/tests/lang/eval-okay-concatstringssep.nix b/tests/functional/lang/eval-okay-concatstringssep.nix
similarity index 100%
rename from tests/lang/eval-okay-concatstringssep.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-context-introspection.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-context-introspection.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-context.exp
rename to tests/functional/lang/eval-okay-context.exp
diff --git a/tests/lang/eval-okay-context.nix b/tests/functional/lang/eval-okay-context.nix
similarity index 100%
rename from tests/lang/eval-okay-context.nix
rename to tests/functional/lang/eval-okay-context.nix
diff --git a/tests/lang/eval-okay-curpos.exp b/tests/functional/lang/eval-okay-curpos.exp
similarity index 100%
rename from tests/lang/eval-okay-curpos.exp
rename to tests/functional/lang/eval-okay-curpos.exp
diff --git a/tests/lang/eval-okay-curpos.nix b/tests/functional/lang/eval-okay-curpos.nix
similarity index 100%
rename from tests/lang/eval-okay-curpos.nix
rename to tests/functional/lang/eval-okay-curpos.nix
diff --git a/tests/lang/eval-okay-deepseq.exp b/tests/functional/lang/eval-okay-deepseq.exp
similarity index 100%
rename from tests/lang/eval-okay-deepseq.exp
rename to tests/functional/lang/eval-okay-deepseq.exp
diff --git a/tests/lang/eval-okay-deepseq.nix b/tests/functional/lang/eval-okay-deepseq.nix
similarity index 100%
rename from tests/lang/eval-okay-deepseq.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-delayed-with-inherit.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-delayed-with-inherit.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-delayed-with.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-delayed-with.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-dynamic-attrs-2.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-dynamic-attrs-2.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-dynamic-attrs-bare.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-dynamic-attrs-bare.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-dynamic-attrs.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-dynamic-attrs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-elem.exp
rename to tests/functional/lang/eval-okay-elem.exp
diff --git a/tests/lang/eval-okay-elem.nix b/tests/functional/lang/eval-okay-elem.nix
similarity index 100%
rename from tests/lang/eval-okay-elem.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-empty-args.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-empty-args.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-eq-derivations.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-eq-derivations.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-eq.exp
rename to tests/functional/lang/eval-okay-eq.exp
diff --git a/tests/lang/eval-okay-eq.nix b/tests/functional/lang/eval-okay-eq.nix
similarity index 100%
rename from tests/lang/eval-okay-eq.nix
rename to tests/functional/lang/eval-okay-eq.nix
diff --git a/tests/lang/eval-okay-filter.exp b/tests/functional/lang/eval-okay-filter.exp
similarity index 100%
rename from tests/lang/eval-okay-filter.exp
rename to tests/functional/lang/eval-okay-filter.exp
diff --git a/tests/lang/eval-okay-filter.nix b/tests/functional/lang/eval-okay-filter.nix
similarity index 100%
rename from tests/lang/eval-okay-filter.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-flake-ref-to-string.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-flake-ref-to-string.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-flatten.exp
rename to tests/functional/lang/eval-okay-flatten.exp
diff --git a/tests/lang/eval-okay-flatten.nix b/tests/functional/lang/eval-okay-flatten.nix
similarity index 100%
rename from tests/lang/eval-okay-flatten.nix
rename to tests/functional/lang/eval-okay-flatten.nix
diff --git a/tests/lang/eval-okay-float.exp b/tests/functional/lang/eval-okay-float.exp
similarity index 100%
rename from tests/lang/eval-okay-float.exp
rename to tests/functional/lang/eval-okay-float.exp
diff --git a/tests/lang/eval-okay-float.nix b/tests/functional/lang/eval-okay-float.nix
similarity index 100%
rename from tests/lang/eval-okay-float.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-floor-ceil.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-floor-ceil.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-foldlStrict-lazy-elements.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-foldlStrict-lazy-elements.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-foldlStrict.exp
rename to tests/functional/lang/eval-okay-foldlStrict.exp
diff --git a/tests/lang/eval-okay-foldlStrict.nix b/tests/functional/lang/eval-okay-foldlStrict.nix
similarity index 100%
rename from tests/lang/eval-okay-foldlStrict.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-fromTOML-timestamps.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-fromTOML-timestamps.flags
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-fromTOML-timestamps.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-fromTOML.exp
rename to tests/functional/lang/eval-okay-fromTOML.exp
diff --git a/tests/lang/eval-okay-fromTOML.nix b/tests/functional/lang/eval-okay-fromTOML.nix
similarity index 100%
rename from tests/lang/eval-okay-fromTOML.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-fromjson-escapes.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-fromjson-escapes.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-fromjson.exp
rename to tests/functional/lang/eval-okay-fromjson.exp
diff --git a/tests/lang/eval-okay-fromjson.nix b/tests/functional/lang/eval-okay-fromjson.nix
similarity index 100%
rename from tests/lang/eval-okay-fromjson.nix
rename to tests/functional/lang/eval-okay-fromjson.nix
diff --git a/tests/lang/eval-okay-functionargs.exp b/tests/functional/lang/eval-okay-functionargs.exp
similarity index 100%
rename from tests/lang/eval-okay-functionargs.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-functionargs.exp.xml
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-functionargs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-getattrpos-functionargs.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-getattrpos-functionargs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-getattrpos-undefined.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-getattrpos-undefined.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-getattrpos.exp
rename to tests/functional/lang/eval-okay-getattrpos.exp
diff --git a/tests/lang/eval-okay-getattrpos.nix b/tests/functional/lang/eval-okay-getattrpos.nix
similarity index 100%
rename from tests/lang/eval-okay-getattrpos.nix
rename to tests/functional/lang/eval-okay-getattrpos.nix
diff --git a/tests/lang/eval-okay-getenv.exp b/tests/functional/lang/eval-okay-getenv.exp
similarity index 100%
rename from tests/lang/eval-okay-getenv.exp
rename to tests/functional/lang/eval-okay-getenv.exp
diff --git a/tests/lang/eval-okay-getenv.nix b/tests/functional/lang/eval-okay-getenv.nix
similarity index 100%
rename from tests/lang/eval-okay-getenv.nix
rename to tests/functional/lang/eval-okay-getenv.nix
diff --git a/tests/lang/eval-okay-groupBy.exp b/tests/functional/lang/eval-okay-groupBy.exp
similarity index 100%
rename from tests/lang/eval-okay-groupBy.exp
rename to tests/functional/lang/eval-okay-groupBy.exp
diff --git a/tests/lang/eval-okay-groupBy.nix b/tests/functional/lang/eval-okay-groupBy.nix
similarity index 100%
rename from tests/lang/eval-okay-groupBy.nix
rename to tests/functional/lang/eval-okay-groupBy.nix
diff --git a/tests/lang/eval-okay-hash.exp b/tests/functional/lang/eval-okay-hash.exp
similarity index 100%
rename from tests/lang/eval-okay-hash.exp
rename to tests/functional/lang/eval-okay-hash.exp
diff --git a/tests/lang/eval-okay-hashfile.exp b/tests/functional/lang/eval-okay-hashfile.exp
similarity index 100%
rename from tests/lang/eval-okay-hashfile.exp
rename to tests/functional/lang/eval-okay-hashfile.exp
diff --git a/tests/lang/eval-okay-hashfile.nix b/tests/functional/lang/eval-okay-hashfile.nix
similarity index 100%
rename from tests/lang/eval-okay-hashfile.nix
rename to tests/functional/lang/eval-okay-hashfile.nix
diff --git a/tests/lang/eval-okay-hashstring.exp b/tests/functional/lang/eval-okay-hashstring.exp
similarity index 100%
rename from tests/lang/eval-okay-hashstring.exp
rename to tests/functional/lang/eval-okay-hashstring.exp
diff --git a/tests/lang/eval-okay-hashstring.nix b/tests/functional/lang/eval-okay-hashstring.nix
similarity index 100%
rename from tests/lang/eval-okay-hashstring.nix
rename to tests/functional/lang/eval-okay-hashstring.nix
diff --git a/tests/lang/eval-okay-if.exp b/tests/functional/lang/eval-okay-if.exp
similarity index 100%
rename from tests/lang/eval-okay-if.exp
rename to tests/functional/lang/eval-okay-if.exp
diff --git a/tests/lang/eval-okay-if.nix b/tests/functional/lang/eval-okay-if.nix
similarity index 100%
rename from tests/lang/eval-okay-if.nix
rename to tests/functional/lang/eval-okay-if.nix
diff --git a/tests/lang/eval-okay-import.exp b/tests/functional/lang/eval-okay-import.exp
similarity index 100%
rename from tests/lang/eval-okay-import.exp
rename to tests/functional/lang/eval-okay-import.exp
diff --git a/tests/lang/eval-okay-import.nix b/tests/functional/lang/eval-okay-import.nix
similarity index 100%
rename from tests/lang/eval-okay-import.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-ind-string.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-ind-string.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-intersectAttrs.exp
rename to tests/functional/lang/eval-okay-intersectAttrs.exp
diff --git a/tests/lang/eval-okay-intersectAttrs.nix b/tests/functional/lang/eval-okay-intersectAttrs.nix
similarity index 100%
rename from tests/lang/eval-okay-intersectAttrs.nix
rename to tests/functional/lang/eval-okay-intersectAttrs.nix
diff --git a/tests/lang/eval-okay-let.exp b/tests/functional/lang/eval-okay-let.exp
similarity index 100%
rename from tests/lang/eval-okay-let.exp
rename to tests/functional/lang/eval-okay-let.exp
diff --git a/tests/lang/eval-okay-let.nix b/tests/functional/lang/eval-okay-let.nix
similarity index 100%
rename from tests/lang/eval-okay-let.nix
rename to tests/functional/lang/eval-okay-let.nix
diff --git a/tests/lang/eval-okay-list.exp b/tests/functional/lang/eval-okay-list.exp
similarity index 100%
rename from tests/lang/eval-okay-list.exp
rename to tests/functional/lang/eval-okay-list.exp
diff --git a/tests/lang/eval-okay-list.nix b/tests/functional/lang/eval-okay-list.nix
similarity index 100%
rename from tests/lang/eval-okay-list.nix
rename to tests/functional/lang/eval-okay-list.nix
diff --git a/tests/lang/eval-okay-listtoattrs.exp b/tests/functional/lang/eval-okay-listtoattrs.exp
similarity index 100%
rename from tests/lang/eval-okay-listtoattrs.exp
rename to tests/functional/lang/eval-okay-listtoattrs.exp
diff --git a/tests/lang/eval-okay-listtoattrs.nix b/tests/functional/lang/eval-okay-listtoattrs.nix
similarity index 100%
rename from tests/lang/eval-okay-listtoattrs.nix
rename to tests/functional/lang/eval-okay-listtoattrs.nix
diff --git a/tests/lang/eval-okay-logic.exp b/tests/functional/lang/eval-okay-logic.exp
similarity index 100%
rename from tests/lang/eval-okay-logic.exp
rename to tests/functional/lang/eval-okay-logic.exp
diff --git a/tests/lang/eval-okay-logic.nix b/tests/functional/lang/eval-okay-logic.nix
similarity index 100%
rename from tests/lang/eval-okay-logic.nix
rename to tests/functional/lang/eval-okay-logic.nix
diff --git a/tests/lang/eval-okay-map.exp b/tests/functional/lang/eval-okay-map.exp
similarity index 100%
rename from tests/lang/eval-okay-map.exp
rename to tests/functional/lang/eval-okay-map.exp
diff --git a/tests/lang/eval-okay-map.nix b/tests/functional/lang/eval-okay-map.nix
similarity index 100%
rename from tests/lang/eval-okay-map.nix
rename to tests/functional/lang/eval-okay-map.nix
diff --git a/tests/lang/eval-okay-mapattrs.exp b/tests/functional/lang/eval-okay-mapattrs.exp
similarity index 100%
rename from tests/lang/eval-okay-mapattrs.exp
rename to tests/functional/lang/eval-okay-mapattrs.exp
diff --git a/tests/lang/eval-okay-mapattrs.nix b/tests/functional/lang/eval-okay-mapattrs.nix
similarity index 100%
rename from tests/lang/eval-okay-mapattrs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-merge-dynamic-attrs.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-merge-dynamic-attrs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-nested-with.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-nested-with.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-new-let.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-new-let.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-null-dynamic-attrs.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-null-dynamic-attrs.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-overrides.exp
rename to tests/functional/lang/eval-okay-overrides.exp
diff --git a/tests/lang/eval-okay-overrides.nix b/tests/functional/lang/eval-okay-overrides.nix
similarity index 100%
rename from tests/lang/eval-okay-overrides.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-parse-flake-ref.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-parse-flake-ref.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-partition.exp
rename to tests/functional/lang/eval-okay-partition.exp
diff --git a/tests/lang/eval-okay-partition.nix b/tests/functional/lang/eval-okay-partition.nix
similarity index 100%
rename from tests/lang/eval-okay-partition.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-path-string-interpolation.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-path-string-interpolation.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-path.exp
rename to tests/functional/lang/eval-okay-path.exp
diff --git a/tests/lang/eval-okay-path.nix b/tests/functional/lang/eval-okay-path.nix
similarity index 100%
rename from tests/lang/eval-okay-path.nix
rename to tests/functional/lang/eval-okay-path.nix
diff --git a/tests/lang/eval-okay-pathexists.exp b/tests/functional/lang/eval-okay-pathexists.exp
similarity index 100%
rename from tests/lang/eval-okay-pathexists.exp
rename to tests/functional/lang/eval-okay-pathexists.exp
diff --git a/tests/lang/eval-okay-pathexists.nix b/tests/functional/lang/eval-okay-pathexists.nix
similarity index 100%
rename from tests/lang/eval-okay-pathexists.nix
rename to tests/functional/lang/eval-okay-pathexists.nix
diff --git a/tests/lang/eval-okay-patterns.exp b/tests/functional/lang/eval-okay-patterns.exp
similarity index 100%
rename from tests/lang/eval-okay-patterns.exp
rename to tests/functional/lang/eval-okay-patterns.exp
diff --git a/tests/lang/eval-okay-patterns.nix b/tests/functional/lang/eval-okay-patterns.nix
similarity index 100%
rename from tests/lang/eval-okay-patterns.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-print.err.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-print.exp
rename to tests/functional/lang/eval-okay-print.exp
diff --git a/tests/lang/eval-okay-print.nix b/tests/functional/lang/eval-okay-print.nix
similarity index 100%
rename from tests/lang/eval-okay-print.nix
rename to tests/functional/lang/eval-okay-print.nix
diff --git a/tests/lang/eval-okay-readDir.exp b/tests/functional/lang/eval-okay-readDir.exp
similarity index 100%
rename from tests/lang/eval-okay-readDir.exp
rename to tests/functional/lang/eval-okay-readDir.exp
diff --git a/tests/lang/eval-okay-readDir.nix b/tests/functional/lang/eval-okay-readDir.nix
similarity index 100%
rename from tests/lang/eval-okay-readDir.nix
rename to tests/functional/lang/eval-okay-readDir.nix
diff --git a/tests/lang/eval-okay-readFileType.exp b/tests/functional/lang/eval-okay-readFileType.exp
similarity index 100%
rename from tests/lang/eval-okay-readFileType.exp
rename to tests/functional/lang/eval-okay-readFileType.exp
diff --git a/tests/lang/eval-okay-readFileType.nix b/tests/functional/lang/eval-okay-readFileType.nix
similarity index 100%
rename from tests/lang/eval-okay-readFileType.nix
rename to tests/functional/lang/eval-okay-readFileType.nix
diff --git a/tests/lang/eval-okay-readfile.exp b/tests/functional/lang/eval-okay-readfile.exp
similarity index 100%
rename from tests/lang/eval-okay-readfile.exp
rename to tests/functional/lang/eval-okay-readfile.exp
diff --git a/tests/lang/eval-okay-readfile.nix b/tests/functional/lang/eval-okay-readfile.nix
similarity index 100%
rename from tests/lang/eval-okay-readfile.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-redefine-builtin.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-redefine-builtin.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regex-match.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regex-match.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regex-split.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regex-split.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regression-20220122.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regression-20220122.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regression-20220125.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-regression-20220125.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-remove.exp
rename to tests/functional/lang/eval-okay-remove.exp
diff --git a/tests/lang/eval-okay-remove.nix b/tests/functional/lang/eval-okay-remove.nix
similarity index 100%
rename from tests/lang/eval-okay-remove.nix
rename to tests/functional/lang/eval-okay-remove.nix
diff --git a/tests/lang/eval-okay-replacestrings.exp b/tests/functional/lang/eval-okay-replacestrings.exp
similarity index 100%
rename from tests/lang/eval-okay-replacestrings.exp
rename to tests/functional/lang/eval-okay-replacestrings.exp
diff --git a/tests/lang/eval-okay-replacestrings.nix b/tests/functional/lang/eval-okay-replacestrings.nix
similarity index 100%
rename from tests/lang/eval-okay-replacestrings.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-1.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-1.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-2.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-2.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-3.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-3.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-4.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-4.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-6.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-6.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-7.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-scope-7.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-search-path.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-search-path.flags
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-search-path.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-seq.exp
rename to tests/functional/lang/eval-okay-seq.exp
diff --git a/tests/lang/eval-okay-seq.nix b/tests/functional/lang/eval-okay-seq.nix
similarity index 100%
rename from tests/lang/eval-okay-seq.nix
rename to tests/functional/lang/eval-okay-seq.nix
diff --git a/tests/lang/eval-okay-sort.exp b/tests/functional/lang/eval-okay-sort.exp
similarity index 100%
rename from tests/lang/eval-okay-sort.exp
rename to tests/functional/lang/eval-okay-sort.exp
diff --git a/tests/lang/eval-okay-sort.nix b/tests/functional/lang/eval-okay-sort.nix
similarity index 100%
rename from tests/lang/eval-okay-sort.nix
rename to tests/functional/lang/eval-okay-sort.nix
diff --git a/tests/lang/eval-okay-splitversion.exp b/tests/functional/lang/eval-okay-splitversion.exp
similarity index 100%
rename from tests/lang/eval-okay-splitversion.exp
rename to tests/functional/lang/eval-okay-splitversion.exp
diff --git a/tests/lang/eval-okay-splitversion.nix b/tests/functional/lang/eval-okay-splitversion.nix
similarity index 100%
rename from tests/lang/eval-okay-splitversion.nix
rename to tests/functional/lang/eval-okay-splitversion.nix
diff --git a/tests/lang/eval-okay-string.exp b/tests/functional/lang/eval-okay-string.exp
similarity index 100%
rename from tests/lang/eval-okay-string.exp
rename to tests/functional/lang/eval-okay-string.exp
diff --git a/tests/lang/eval-okay-string.nix b/tests/functional/lang/eval-okay-string.nix
similarity index 100%
rename from tests/lang/eval-okay-string.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-strings-as-attrs-names.exp
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-strings-as-attrs-names.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-substring.exp
rename to tests/functional/lang/eval-okay-substring.exp
diff --git a/tests/lang/eval-okay-substring.nix b/tests/functional/lang/eval-okay-substring.nix
similarity index 100%
rename from tests/lang/eval-okay-substring.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-tail-call-1.exp-disabled
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-tail-call-1.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-tojson.exp
rename to tests/functional/lang/eval-okay-tojson.exp
diff --git a/tests/lang/eval-okay-tojson.nix b/tests/functional/lang/eval-okay-tojson.nix
similarity index 100%
rename from tests/lang/eval-okay-tojson.nix
rename to tests/functional/lang/eval-okay-tojson.nix
diff --git a/tests/lang/eval-okay-toxml.exp b/tests/functional/lang/eval-okay-toxml.exp
similarity index 100%
rename from tests/lang/eval-okay-toxml.exp
rename to tests/functional/lang/eval-okay-toxml.exp
diff --git a/tests/lang/eval-okay-toxml.nix b/tests/functional/lang/eval-okay-toxml.nix
similarity index 100%
rename from tests/lang/eval-okay-toxml.nix
rename to tests/functional/lang/eval-okay-toxml.nix
diff --git a/tests/lang/eval-okay-toxml2.exp b/tests/functional/lang/eval-okay-toxml2.exp
similarity index 100%
rename from tests/lang/eval-okay-toxml2.exp
rename to tests/functional/lang/eval-okay-toxml2.exp
diff --git a/tests/lang/eval-okay-toxml2.nix b/tests/functional/lang/eval-okay-toxml2.nix
similarity index 100%
rename from tests/lang/eval-okay-toxml2.nix
rename to tests/functional/lang/eval-okay-toxml2.nix
diff --git a/tests/lang/eval-okay-tryeval.exp b/tests/functional/lang/eval-okay-tryeval.exp
similarity index 100%
rename from tests/lang/eval-okay-tryeval.exp
rename to tests/functional/lang/eval-okay-tryeval.exp
diff --git a/tests/lang/eval-okay-tryeval.nix b/tests/functional/lang/eval-okay-tryeval.nix
similarity index 100%
rename from tests/lang/eval-okay-tryeval.nix
rename to tests/functional/lang/eval-okay-tryeval.nix
diff --git a/tests/lang/eval-okay-types.exp b/tests/functional/lang/eval-okay-types.exp
similarity index 100%
rename from tests/lang/eval-okay-types.exp
rename to tests/functional/lang/eval-okay-types.exp
diff --git a/tests/lang/eval-okay-types.nix b/tests/functional/lang/eval-okay-types.nix
similarity index 100%
rename from tests/lang/eval-okay-types.nix
rename to tests/functional/lang/eval-okay-types.nix
diff --git a/tests/lang/eval-okay-versions.exp b/tests/functional/lang/eval-okay-versions.exp
similarity index 100%
rename from tests/lang/eval-okay-versions.exp
rename to tests/functional/lang/eval-okay-versions.exp
diff --git a/tests/lang/eval-okay-versions.nix b/tests/functional/lang/eval-okay-versions.nix
similarity index 100%
rename from tests/lang/eval-okay-versions.nix
rename to tests/functional/lang/eval-okay-versions.nix
diff --git a/tests/lang/eval-okay-with.exp b/tests/functional/lang/eval-okay-with.exp
similarity index 100%
rename from tests/lang/eval-okay-with.exp
rename to tests/functional/lang/eval-okay-with.exp
diff --git a/tests/lang/eval-okay-with.nix b/tests/functional/lang/eval-okay-with.nix
similarity index 100%
rename from tests/lang/eval-okay-with.nix
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-xml.exp.xml
rename to 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
similarity index 100%
rename from tests/lang/eval-okay-xml.nix
rename to tests/functional/lang/eval-okay-xml.nix
diff --git a/tests/lang/eval-okay-zipAttrsWith.exp b/tests/functional/lang/eval-okay-zipAttrsWith.exp
similarity index 100%
rename from tests/lang/eval-okay-zipAttrsWith.exp
rename to tests/functional/lang/eval-okay-zipAttrsWith.exp
diff --git a/tests/lang/eval-okay-zipAttrsWith.nix b/tests/functional/lang/eval-okay-zipAttrsWith.nix
similarity index 100%
rename from tests/lang/eval-okay-zipAttrsWith.nix
rename to tests/functional/lang/eval-okay-zipAttrsWith.nix
diff --git a/tests/lang/framework.sh b/tests/functional/lang/framework.sh
similarity index 100%
rename from tests/lang/framework.sh
rename to tests/functional/lang/framework.sh
diff --git a/tests/lang/imported.nix b/tests/functional/lang/imported.nix
similarity index 100%
rename from tests/lang/imported.nix
rename to tests/functional/lang/imported.nix
diff --git a/tests/lang/imported2.nix b/tests/functional/lang/imported2.nix
similarity index 100%
rename from tests/lang/imported2.nix
rename to tests/functional/lang/imported2.nix
diff --git a/tests/lang/lib.nix b/tests/functional/lang/lib.nix
similarity index 100%
rename from tests/lang/lib.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-1.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-1.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-2.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-2.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-3.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-3.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-4.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-4.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-6.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-7.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-attrs-7.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-formals.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-dup-formals.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-eof-in-string.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-eof-in-string.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-mixed-nested-attrs1.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-mixed-nested-attrs1.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-mixed-nested-attrs2.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-mixed-nested-attrs2.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-patterns-1.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-patterns-1.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-regression-20060610.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-regression-20060610.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-undef-var-2.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-undef-var-2.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-undef-var.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-undef-var.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-utf8.err.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-fail-utf8.nix
rename to tests/functional/lang/parse-fail-utf8.nix
diff --git a/tests/lang/parse-okay-1.exp b/tests/functional/lang/parse-okay-1.exp
similarity index 100%
rename from tests/lang/parse-okay-1.exp
rename to tests/functional/lang/parse-okay-1.exp
diff --git a/tests/lang/parse-okay-1.nix b/tests/functional/lang/parse-okay-1.nix
similarity index 100%
rename from tests/lang/parse-okay-1.nix
rename to tests/functional/lang/parse-okay-1.nix
diff --git a/tests/lang/parse-okay-crlf.exp b/tests/functional/lang/parse-okay-crlf.exp
similarity index 100%
rename from tests/lang/parse-okay-crlf.exp
rename to tests/functional/lang/parse-okay-crlf.exp
diff --git a/tests/lang/parse-okay-crlf.nix b/tests/functional/lang/parse-okay-crlf.nix
similarity index 100%
rename from tests/lang/parse-okay-crlf.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-dup-attrs-5.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-dup-attrs-5.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-dup-attrs-6.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-dup-attrs-6.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-mixed-nested-attrs-1.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-mixed-nested-attrs-1.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-mixed-nested-attrs-2.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-mixed-nested-attrs-2.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-mixed-nested-attrs-3.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-mixed-nested-attrs-3.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-regression-20041027.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-regression-20041027.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-regression-751.exp
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-regression-751.nix
rename to 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
similarity index 100%
rename from tests/lang/parse-okay-subversion.exp
rename to tests/functional/lang/parse-okay-subversion.exp
diff --git a/tests/lang/parse-okay-subversion.nix b/tests/functional/lang/parse-okay-subversion.nix
similarity index 100%
rename from tests/lang/parse-okay-subversion.nix
rename to tests/functional/lang/parse-okay-subversion.nix
diff --git a/tests/lang/parse-okay-url.exp b/tests/functional/lang/parse-okay-url.exp
similarity index 100%
rename from tests/lang/parse-okay-url.exp
rename to tests/functional/lang/parse-okay-url.exp
diff --git a/tests/lang/parse-okay-url.nix b/tests/functional/lang/parse-okay-url.nix
similarity index 100%
rename from tests/lang/parse-okay-url.nix
rename to tests/functional/lang/parse-okay-url.nix
diff --git a/tests/lang/readDir/bar b/tests/functional/lang/readDir/bar
similarity index 100%
rename from tests/lang/readDir/bar
rename to tests/functional/lang/readDir/bar
diff --git a/tests/lang/readDir/foo/git-hates-directories b/tests/functional/lang/readDir/foo/git-hates-directories
similarity index 100%
rename from tests/lang/readDir/foo/git-hates-directories
rename to tests/functional/lang/readDir/foo/git-hates-directories
diff --git a/tests/lang/readDir/ldir b/tests/functional/lang/readDir/ldir
similarity index 100%
rename from tests/lang/readDir/ldir
rename to tests/functional/lang/readDir/ldir
diff --git a/tests/lang/readDir/linked b/tests/functional/lang/readDir/linked
similarity index 100%
rename from tests/lang/readDir/linked
rename to tests/functional/lang/readDir/linked
diff --git a/tests/legacy-ssh-store.sh b/tests/functional/legacy-ssh-store.sh
similarity index 100%
rename from tests/legacy-ssh-store.sh
rename to tests/functional/legacy-ssh-store.sh
diff --git a/tests/linux-sandbox-cert-test.nix b/tests/functional/linux-sandbox-cert-test.nix
similarity index 100%
rename from tests/linux-sandbox-cert-test.nix
rename to tests/functional/linux-sandbox-cert-test.nix
diff --git a/tests/linux-sandbox.sh b/tests/functional/linux-sandbox.sh
similarity index 100%
rename from tests/linux-sandbox.sh
rename to tests/functional/linux-sandbox.sh
diff --git a/tests/local-store.sh b/tests/functional/local-store.sh
similarity index 100%
rename from tests/local-store.sh
rename to tests/functional/local-store.sh
diff --git a/tests/local.mk b/tests/functional/local.mk
similarity index 89%
rename from tests/local.mk
rename to 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
similarity index 100%
rename from tests/logging.sh
rename to tests/functional/logging.sh
diff --git a/tests/misc.sh b/tests/functional/misc.sh
similarity index 100%
rename from tests/misc.sh
rename to tests/functional/misc.sh
diff --git a/tests/multiple-outputs.nix b/tests/functional/multiple-outputs.nix
similarity index 100%
rename from tests/multiple-outputs.nix
rename to tests/functional/multiple-outputs.nix
diff --git a/tests/multiple-outputs.sh b/tests/functional/multiple-outputs.sh
similarity index 100%
rename from tests/multiple-outputs.sh
rename to tests/functional/multiple-outputs.sh
diff --git a/tests/nar-access.nix b/tests/functional/nar-access.nix
similarity index 100%
rename from tests/nar-access.nix
rename to tests/functional/nar-access.nix
diff --git a/tests/nar-access.sh b/tests/functional/nar-access.sh
similarity index 100%
rename from tests/nar-access.sh
rename to tests/functional/nar-access.sh
diff --git a/tests/nested-sandboxing.sh b/tests/functional/nested-sandboxing.sh
similarity index 75%
rename from tests/nested-sandboxing.sh
rename to 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
similarity index 100%
rename from tests/nested-sandboxing/command.sh
rename to tests/functional/nested-sandboxing/command.sh
diff --git a/tests/nested-sandboxing/runner.nix b/tests/functional/nested-sandboxing/runner.nix
similarity index 100%
rename from tests/nested-sandboxing/runner.nix
rename to tests/functional/nested-sandboxing/runner.nix
diff --git a/tests/nix-build-examples.nix b/tests/functional/nix-build-examples.nix
similarity index 100%
rename from tests/nix-build-examples.nix
rename to tests/functional/nix-build-examples.nix
diff --git a/tests/nix-build.sh b/tests/functional/nix-build.sh
similarity index 100%
rename from tests/nix-build.sh
rename to tests/functional/nix-build.sh
diff --git a/tests/nix-channel.sh b/tests/functional/nix-channel.sh
similarity index 100%
rename from tests/nix-channel.sh
rename to tests/functional/nix-channel.sh
diff --git a/tests/nix-collect-garbage-d.sh b/tests/functional/nix-collect-garbage-d.sh
similarity index 100%
rename from tests/nix-collect-garbage-d.sh
rename to tests/functional/nix-collect-garbage-d.sh
diff --git a/tests/nix-copy-ssh-ng.sh b/tests/functional/nix-copy-ssh-ng.sh
similarity index 100%
rename from tests/nix-copy-ssh-ng.sh
rename to tests/functional/nix-copy-ssh-ng.sh
diff --git a/tests/nix-copy-ssh.sh b/tests/functional/nix-copy-ssh.sh
similarity index 100%
rename from tests/nix-copy-ssh.sh
rename to tests/functional/nix-copy-ssh.sh
diff --git a/tests/nix-daemon-untrusting.sh b/tests/functional/nix-daemon-untrusting.sh
similarity index 100%
rename from tests/nix-daemon-untrusting.sh
rename to tests/functional/nix-daemon-untrusting.sh
diff --git a/tests/nix-profile.sh b/tests/functional/nix-profile.sh
similarity index 100%
rename from tests/nix-profile.sh
rename to tests/functional/nix-profile.sh
diff --git a/tests/nix-shell.sh b/tests/functional/nix-shell.sh
similarity index 100%
rename from tests/nix-shell.sh
rename to tests/functional/nix-shell.sh
diff --git a/tests/nix_path.sh b/tests/functional/nix_path.sh
similarity index 100%
rename from tests/nix_path.sh
rename to tests/functional/nix_path.sh
diff --git a/tests/optimise-store.sh b/tests/functional/optimise-store.sh
similarity index 100%
rename from tests/optimise-store.sh
rename to tests/functional/optimise-store.sh
diff --git a/tests/output-normalization.sh b/tests/functional/output-normalization.sh
similarity index 100%
rename from tests/output-normalization.sh
rename to tests/functional/output-normalization.sh
diff --git a/tests/parallel.builder.sh b/tests/functional/parallel.builder.sh
similarity index 100%
rename from tests/parallel.builder.sh
rename to tests/functional/parallel.builder.sh
diff --git a/tests/parallel.nix b/tests/functional/parallel.nix
similarity index 100%
rename from tests/parallel.nix
rename to tests/functional/parallel.nix
diff --git a/tests/parallel.sh b/tests/functional/parallel.sh
similarity index 100%
rename from tests/parallel.sh
rename to tests/functional/parallel.sh
diff --git a/tests/pass-as-file.sh b/tests/functional/pass-as-file.sh
similarity index 100%
rename from tests/pass-as-file.sh
rename to tests/functional/pass-as-file.sh
diff --git a/tests/path-from-hash-part.sh b/tests/functional/path-from-hash-part.sh
similarity index 100%
rename from tests/path-from-hash-part.sh
rename to tests/functional/path-from-hash-part.sh
diff --git a/tests/path.nix b/tests/functional/path.nix
similarity index 100%
rename from tests/path.nix
rename to tests/functional/path.nix
diff --git a/tests/placeholders.sh b/tests/functional/placeholders.sh
similarity index 100%
rename from tests/placeholders.sh
rename to tests/functional/placeholders.sh
diff --git a/tests/plugins.sh b/tests/functional/plugins.sh
similarity index 100%
rename from tests/plugins.sh
rename to tests/functional/plugins.sh
diff --git a/tests/plugins/local.mk b/tests/functional/plugins/local.mk
similarity index 100%
rename from tests/plugins/local.mk
rename to tests/functional/plugins/local.mk
diff --git a/tests/plugins/plugintest.cc b/tests/functional/plugins/plugintest.cc
similarity index 100%
rename from tests/plugins/plugintest.cc
rename to tests/functional/plugins/plugintest.cc
diff --git a/tests/post-hook.sh b/tests/functional/post-hook.sh
similarity index 100%
rename from tests/post-hook.sh
rename to tests/functional/post-hook.sh
diff --git a/tests/pure-eval.nix b/tests/functional/pure-eval.nix
similarity index 100%
rename from tests/pure-eval.nix
rename to tests/functional/pure-eval.nix
diff --git a/tests/pure-eval.sh b/tests/functional/pure-eval.sh
similarity index 100%
rename from tests/pure-eval.sh
rename to tests/functional/pure-eval.sh
diff --git a/tests/push-to-store-old.sh b/tests/functional/push-to-store-old.sh
similarity index 100%
rename from tests/push-to-store-old.sh
rename to tests/functional/push-to-store-old.sh
diff --git a/tests/push-to-store.sh b/tests/functional/push-to-store.sh
similarity index 100%
rename from tests/push-to-store.sh
rename to tests/functional/push-to-store.sh
diff --git a/tests/read-only-store.sh b/tests/functional/read-only-store.sh
similarity index 100%
rename from tests/read-only-store.sh
rename to tests/functional/read-only-store.sh
diff --git a/tests/readfile-context.nix b/tests/functional/readfile-context.nix
similarity index 100%
rename from tests/readfile-context.nix
rename to tests/functional/readfile-context.nix
diff --git a/tests/readfile-context.sh b/tests/functional/readfile-context.sh
similarity index 100%
rename from tests/readfile-context.sh
rename to tests/functional/readfile-context.sh
diff --git a/tests/recursive.nix b/tests/functional/recursive.nix
similarity index 100%
rename from tests/recursive.nix
rename to tests/functional/recursive.nix
diff --git a/tests/recursive.sh b/tests/functional/recursive.sh
similarity index 100%
rename from tests/recursive.sh
rename to tests/functional/recursive.sh
diff --git a/tests/referrers.sh b/tests/functional/referrers.sh
similarity index 100%
rename from tests/referrers.sh
rename to tests/functional/referrers.sh
diff --git a/tests/remote-store.sh b/tests/functional/remote-store.sh
similarity index 100%
rename from tests/remote-store.sh
rename to tests/functional/remote-store.sh
diff --git a/tests/repair.sh b/tests/functional/repair.sh
similarity index 100%
rename from tests/repair.sh
rename to tests/functional/repair.sh
diff --git a/tests/repl.sh b/tests/functional/repl.sh
similarity index 100%
rename from tests/repl.sh
rename to tests/functional/repl.sh
diff --git a/tests/restricted.nix b/tests/functional/restricted.nix
similarity index 100%
rename from tests/restricted.nix
rename to tests/functional/restricted.nix
diff --git a/tests/restricted.sh b/tests/functional/restricted.sh
similarity index 95%
rename from tests/restricted.sh
rename to 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
similarity index 100%
rename from tests/search.nix
rename to tests/functional/search.nix
diff --git a/tests/search.sh b/tests/functional/search.sh
similarity index 100%
rename from tests/search.sh
rename to tests/functional/search.sh
diff --git a/tests/secure-drv-outputs.nix b/tests/functional/secure-drv-outputs.nix
similarity index 100%
rename from tests/secure-drv-outputs.nix
rename to tests/functional/secure-drv-outputs.nix
diff --git a/tests/secure-drv-outputs.sh b/tests/functional/secure-drv-outputs.sh
similarity index 100%
rename from tests/secure-drv-outputs.sh
rename to tests/functional/secure-drv-outputs.sh
diff --git a/tests/selfref-gc.sh b/tests/functional/selfref-gc.sh
similarity index 100%
rename from tests/selfref-gc.sh
rename to tests/functional/selfref-gc.sh
diff --git a/tests/shell-hello.nix b/tests/functional/shell-hello.nix
similarity index 100%
rename from tests/shell-hello.nix
rename to tests/functional/shell-hello.nix
diff --git a/tests/shell.nix b/tests/functional/shell.nix
similarity index 100%
rename from tests/shell.nix
rename to tests/functional/shell.nix
diff --git a/tests/shell.sh b/tests/functional/shell.sh
similarity index 100%
rename from tests/shell.sh
rename to tests/functional/shell.sh
diff --git a/tests/shell.shebang.rb b/tests/functional/shell.shebang.rb
similarity index 100%
rename from tests/shell.shebang.rb
rename to tests/functional/shell.shebang.rb
diff --git a/tests/shell.shebang.sh b/tests/functional/shell.shebang.sh
similarity index 100%
rename from tests/shell.shebang.sh
rename to tests/functional/shell.shebang.sh
diff --git a/tests/signing.sh b/tests/functional/signing.sh
similarity index 100%
rename from tests/signing.sh
rename to tests/functional/signing.sh
diff --git a/tests/simple-failing.nix b/tests/functional/simple-failing.nix
similarity index 100%
rename from tests/simple-failing.nix
rename to tests/functional/simple-failing.nix
diff --git a/tests/simple.builder.sh b/tests/functional/simple.builder.sh
similarity index 100%
rename from tests/simple.builder.sh
rename to tests/functional/simple.builder.sh
diff --git a/tests/simple.nix b/tests/functional/simple.nix
similarity index 100%
rename from tests/simple.nix
rename to tests/functional/simple.nix
diff --git a/tests/simple.sh b/tests/functional/simple.sh
similarity index 100%
rename from tests/simple.sh
rename to tests/functional/simple.sh
diff --git a/tests/ssh-relay.sh b/tests/functional/ssh-relay.sh
similarity index 100%
rename from tests/ssh-relay.sh
rename to tests/functional/ssh-relay.sh
diff --git a/tests/store-ping.sh b/tests/functional/store-ping.sh
similarity index 100%
rename from tests/store-ping.sh
rename to tests/functional/store-ping.sh
diff --git a/tests/structured-attrs-shell.nix b/tests/functional/structured-attrs-shell.nix
similarity index 100%
rename from tests/structured-attrs-shell.nix
rename to tests/functional/structured-attrs-shell.nix
diff --git a/tests/structured-attrs.nix b/tests/functional/structured-attrs.nix
similarity index 100%
rename from tests/structured-attrs.nix
rename to tests/functional/structured-attrs.nix
diff --git a/tests/structured-attrs.sh b/tests/functional/structured-attrs.sh
similarity index 100%
rename from tests/structured-attrs.sh
rename to tests/functional/structured-attrs.sh
diff --git a/tests/substitute-with-invalid-ca.sh b/tests/functional/substitute-with-invalid-ca.sh
similarity index 100%
rename from tests/substitute-with-invalid-ca.sh
rename to tests/functional/substitute-with-invalid-ca.sh
diff --git a/tests/suggestions.sh b/tests/functional/suggestions.sh
similarity index 100%
rename from tests/suggestions.sh
rename to tests/functional/suggestions.sh
diff --git a/tests/supplementary-groups.sh b/tests/functional/supplementary-groups.sh
similarity index 100%
rename from tests/supplementary-groups.sh
rename to tests/functional/supplementary-groups.sh
diff --git a/tests/tarball.sh b/tests/functional/tarball.sh
similarity index 100%
rename from tests/tarball.sh
rename to tests/functional/tarball.sh
diff --git a/tests/test-infra.sh b/tests/functional/test-infra.sh
similarity index 100%
rename from tests/test-infra.sh
rename to tests/functional/test-infra.sh
diff --git a/tests/test-libstoreconsumer.sh b/tests/functional/test-libstoreconsumer.sh
similarity index 100%
rename from tests/test-libstoreconsumer.sh
rename to tests/functional/test-libstoreconsumer.sh
diff --git a/tests/test-libstoreconsumer/README.md b/tests/functional/test-libstoreconsumer/README.md
similarity index 100%
rename from tests/test-libstoreconsumer/README.md
rename to tests/functional/test-libstoreconsumer/README.md
diff --git a/tests/test-libstoreconsumer/local.mk b/tests/functional/test-libstoreconsumer/local.mk
similarity index 100%
rename from tests/test-libstoreconsumer/local.mk
rename to tests/functional/test-libstoreconsumer/local.mk
diff --git a/tests/test-libstoreconsumer/main.cc b/tests/functional/test-libstoreconsumer/main.cc
similarity index 100%
rename from tests/test-libstoreconsumer/main.cc
rename to tests/functional/test-libstoreconsumer/main.cc
diff --git a/tests/timeout.nix b/tests/functional/timeout.nix
similarity index 100%
rename from tests/timeout.nix
rename to tests/functional/timeout.nix
diff --git a/tests/timeout.sh b/tests/functional/timeout.sh
similarity index 100%
rename from tests/timeout.sh
rename to tests/functional/timeout.sh
diff --git a/tests/toString-path.sh b/tests/functional/toString-path.sh
similarity index 100%
rename from tests/toString-path.sh
rename to tests/functional/toString-path.sh
diff --git a/tests/undefined-variable.nix b/tests/functional/undefined-variable.nix
similarity index 100%
rename from tests/undefined-variable.nix
rename to tests/functional/undefined-variable.nix
diff --git a/tests/user-envs-migration.sh b/tests/functional/user-envs-migration.sh
similarity index 100%
rename from tests/user-envs-migration.sh
rename to tests/functional/user-envs-migration.sh
diff --git a/tests/user-envs.builder.sh b/tests/functional/user-envs.builder.sh
similarity index 100%
rename from tests/user-envs.builder.sh
rename to tests/functional/user-envs.builder.sh
diff --git a/tests/user-envs.nix b/tests/functional/user-envs.nix
similarity index 100%
rename from tests/user-envs.nix
rename to tests/functional/user-envs.nix
diff --git a/tests/user-envs.sh b/tests/functional/user-envs.sh
similarity index 100%
rename from tests/user-envs.sh
rename to tests/functional/user-envs.sh
diff --git a/tests/why-depends.sh b/tests/functional/why-depends.sh
similarity index 100%
rename from tests/why-depends.sh
rename to tests/functional/why-depends.sh
diff --git a/tests/zstd.sh b/tests/functional/zstd.sh
similarity index 100%
rename from tests/zstd.sh
rename to 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
similarity index 100%
rename from src/libexpr/tests/libexpr.hh
rename to 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
similarity index 95%
rename from src/libexpr/tests/value/context.hh
rename to 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
similarity index 100%
rename from src/libexpr/tests/derived-path.cc
rename to tests/unit/libexpr/derived-path.cc
diff --git a/src/libexpr/tests/error_traces.cc b/tests/unit/libexpr/error_traces.cc
similarity index 100%
rename from src/libexpr/tests/error_traces.cc
rename to tests/unit/libexpr/error_traces.cc
diff --git a/src/libexpr/tests/flakeref.cc b/tests/unit/libexpr/flakeref.cc
similarity index 100%
rename from src/libexpr/tests/flakeref.cc
rename to tests/unit/libexpr/flakeref.cc
diff --git a/src/libexpr/tests/json.cc b/tests/unit/libexpr/json.cc
similarity index 100%
rename from src/libexpr/tests/json.cc
rename to 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
similarity index 100%
rename from src/libexpr/tests/primops.cc
rename to tests/unit/libexpr/primops.cc
diff --git a/src/libexpr/tests/search-path.cc b/tests/unit/libexpr/search-path.cc
similarity index 100%
rename from src/libexpr/tests/search-path.cc
rename to tests/unit/libexpr/search-path.cc
diff --git a/src/libexpr/tests/trivial.cc b/tests/unit/libexpr/trivial.cc
similarity index 100%
rename from src/libexpr/tests/trivial.cc
rename to tests/unit/libexpr/trivial.cc
diff --git a/src/libexpr/tests/value/context.cc b/tests/unit/libexpr/value/context.cc
similarity index 83%
rename from src/libexpr/tests/value/context.cc
rename to 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
similarity index 100%
rename from src/libexpr/tests/value/print.cc
rename to 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
similarity index 100%
rename from src/libstore/tests/derived-path.hh
rename to tests/unit/libstore-support/tests/derived-path.hh
diff --git a/src/libstore/tests/libstore.hh b/tests/unit/libstore-support/tests/libstore.hh
similarity index 100%
rename from src/libstore/tests/libstore.hh
rename to 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
similarity index 89%
rename from src/libstore/tests/outputs-spec.hh
rename to 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
similarity index 82%
rename from src/libstore/tests/path.hh
rename to 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
similarity index 100%
rename from src/libstore/tests/derivation.cc
rename to tests/unit/libstore/derivation.cc
diff --git a/src/libstore/tests/derived-path.cc b/tests/unit/libstore/derived-path.cc
similarity index 66%
rename from src/libstore/tests/derived-path.cc
rename to 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
similarity index 100%
rename from src/libstore/tests/downstream-placeholder.cc
rename to 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
similarity index 97%
rename from src/libstore/tests/machines.cc
rename to 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
similarity index 100%
rename from src/libstore/tests/nar-info-disk-cache.cc
rename to tests/unit/libstore/nar-info-disk-cache.cc
diff --git a/src/libstore/tests/outputs-spec.cc b/tests/unit/libstore/outputs-spec.cc
similarity index 92%
rename from src/libstore/tests/outputs-spec.cc
rename to 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
similarity index 59%
rename from src/libstore/tests/path.cc
rename to 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
similarity index 100%
rename from src/libstore/tests/references.cc
rename to 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
similarity index 100%
rename from src/libstore/tests/test-data/machines.bad_format
rename to 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
similarity index 100%
rename from src/libstore/tests/test-data/machines.valid
rename to 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
similarity index 100%
rename from src/libutil/tests/hash.hh
rename to tests/unit/libutil-support/tests/hash.hh
diff --git a/src/libutil/tests/canon-path.cc b/tests/unit/libutil/canon-path.cc
similarity index 100%
rename from src/libutil/tests/canon-path.cc
rename to tests/unit/libutil/canon-path.cc
diff --git a/src/libutil/tests/chunked-vector.cc b/tests/unit/libutil/chunked-vector.cc
similarity index 100%
rename from src/libutil/tests/chunked-vector.cc
rename to tests/unit/libutil/chunked-vector.cc
diff --git a/src/libutil/tests/closure.cc b/tests/unit/libutil/closure.cc
similarity index 100%
rename from src/libutil/tests/closure.cc
rename to tests/unit/libutil/closure.cc
diff --git a/src/libutil/tests/compression.cc b/tests/unit/libutil/compression.cc
similarity index 100%
rename from src/libutil/tests/compression.cc
rename to tests/unit/libutil/compression.cc
diff --git a/src/libutil/tests/config.cc b/tests/unit/libutil/config.cc
similarity index 100%
rename from src/libutil/tests/config.cc
rename to tests/unit/libutil/config.cc
diff --git a/src/libutil/tests/git.cc b/tests/unit/libutil/git.cc
similarity index 100%
rename from src/libutil/tests/git.cc
rename to tests/unit/libutil/git.cc
diff --git a/src/libutil/tests/hash.cc b/tests/unit/libutil/hash.cc
similarity index 90%
rename from src/libutil/tests/hash.cc
rename to 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
similarity index 100%
rename from src/libutil/tests/hilite.cc
rename to 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
similarity index 100%
rename from src/libutil/tests/logging.cc
rename to tests/unit/libutil/logging.cc
diff --git a/src/libutil/tests/lru-cache.cc b/tests/unit/libutil/lru-cache.cc
similarity index 100%
rename from src/libutil/tests/lru-cache.cc
rename to tests/unit/libutil/lru-cache.cc
diff --git a/src/libutil/tests/pool.cc b/tests/unit/libutil/pool.cc
similarity index 100%
rename from src/libutil/tests/pool.cc
rename to tests/unit/libutil/pool.cc
diff --git a/src/libutil/tests/references.cc b/tests/unit/libutil/references.cc
similarity index 100%
rename from src/libutil/tests/references.cc
rename to tests/unit/libutil/references.cc
diff --git a/src/libutil/tests/suggestions.cc b/tests/unit/libutil/suggestions.cc
similarity index 100%
rename from src/libutil/tests/suggestions.cc
rename to tests/unit/libutil/suggestions.cc
diff --git a/src/libutil/tests/tests.cc b/tests/unit/libutil/tests.cc
similarity index 100%
rename from src/libutil/tests/tests.cc
rename to tests/unit/libutil/tests.cc
diff --git a/src/libutil/tests/url.cc b/tests/unit/libutil/url.cc
similarity index 100%
rename from src/libutil/tests/url.cc
rename to tests/unit/libutil/url.cc
diff --git a/src/libutil/tests/xml-writer.cc b/tests/unit/libutil/xml-writer.cc
similarity index 100%
rename from src/libutil/tests/xml-writer.cc
rename to tests/unit/libutil/xml-writer.cc