diff --git a/.gitignore b/.gitignore
index 838cac335..fdfd744e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,22 +49,22 @@ perl/Makefile.config
 /src/libexpr/parser-tab.output
 /src/libexpr/nix.tbl
 /src/libexpr/tests
-/src/libexpr-test/libnixexpr-tests
+/src/nix-expr-tests/libnixexpr-tests
 
 # /src/libfetchers
-/src/libfetchers-test/libnixfetchers-tests
+/src/nix-fetchers-tests/libnixfetchers-tests
 
 # /src/libflake
-/src/libflake-test/libnixflake-tests
+/src/nix-flake-tests/libnixflake-tests
 
 # /src/libstore/
 *.gen.*
 /src/libstore/tests
-/src/libstore-test/libnixstore-tests
+/src/nix-store-tests/libnixstore-tests
 
 # /src/libutil/
 /src/libutil/tests
-/src/libutil-test/libnixutil-tests
+/src/nix-util-tests/libnixutil-tests
 
 /src/nix/nix
 
diff --git a/doc/manual/src/contributing/testing.md b/doc/manual/src/contributing/testing.md
index ed9c25f7a..399174de5 100644
--- a/doc/manual/src/contributing/testing.md
+++ b/doc/manual/src/contributing/testing.md
@@ -60,10 +60,10 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 > ```
 
 The tests for each Nix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `src/${library_name_without-nix}-test`.
-Given an interface (header) and implementation pair in the original library, say, `src/libexpr/value/context.{hh,cc}`, we write tests for it in `src/libexpr-test/value/context.cc`, and (possibly) declare/define additional interfaces for testing purposes in `src/libexpr-test-support/tests/value/context.{hh,cc}`.
+Given an interface (header) and implementation pair in the original library, say, `src/libexpr/value/context.{hh,cc}`, we write tests for it in `src/nix-expr-tests/value/context.cc`, and (possibly) declare/define additional interfaces for testing purposes in `src/nix-expr-test-support/tests/value/context.{hh,cc}`.
 
 Data for unit tests is stored in a `data` subdir of the directory for each unit test executable.
-For example, `libnixstore` code is in `src/libstore`, and its test data is in `src/libstore-test/data`.
+For example, `libnixstore` code is in `src/libstore`, and its test data is in `src/nix-store-tests/data`.
 The path to the `src/${library_name_without-nix}-test/data` directory is passed to the unit test executable with the environment variable `_NIX_TEST_UNIT_DATA`.
 Note that each executable only gets the data for its tests.
 
diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index c0373dee4..a39a70890 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -429,65 +429,65 @@
             ''^tests/nixos/ca-fd-leak/sender\.c''
             ''^tests/nixos/ca-fd-leak/smuggler\.c''
             ''^tests/nixos/user-sandboxing/attacker\.c''
-            ''^src/libexpr-test-support/tests/libexpr\.hh''
-            ''^src/libexpr-test-support/tests/value/context\.cc''
-            ''^src/libexpr-test-support/tests/value/context\.hh''
-            ''^src/libexpr-test/derived-path\.cc''
-            ''^src/libexpr-test/error_traces\.cc''
-            ''^src/libexpr-test/eval\.cc''
-            ''^src/libexpr-test/json\.cc''
-            ''^src/libexpr-test/main\.cc''
-            ''^src/libexpr-test/primops\.cc''
-            ''^src/libexpr-test/search-path\.cc''
-            ''^src/libexpr-test/trivial\.cc''
-            ''^src/libexpr-test/value/context\.cc''
-            ''^src/libexpr-test/value/print\.cc''
-            ''^src/libfetchers-test/public-key\.cc''
-            ''^src/libflake-test/flakeref\.cc''
-            ''^src/libflake-test/url-name\.cc''
-            ''^src/libstore-test-support/tests/derived-path\.cc''
-            ''^src/libstore-test-support/tests/derived-path\.hh''
-            ''^src/libstore-test-support/tests/nix_api_store\.hh''
-            ''^src/libstore-test-support/tests/outputs-spec\.cc''
-            ''^src/libstore-test-support/tests/outputs-spec\.hh''
-            ''^src/libstore-test-support/tests/path\.cc''
-            ''^src/libstore-test-support/tests/path\.hh''
-            ''^src/libstore-test-support/tests/protocol\.hh''
-            ''^src/libstore-test/common-protocol\.cc''
-            ''^src/libstore-test/content-address\.cc''
-            ''^src/libstore-test/derivation\.cc''
-            ''^src/libstore-test/derived-path\.cc''
-            ''^src/libstore-test/downstream-placeholder\.cc''
-            ''^src/libstore-test/machines\.cc''
-            ''^src/libstore-test/nar-info-disk-cache\.cc''
-            ''^src/libstore-test/nar-info\.cc''
-            ''^src/libstore-test/outputs-spec\.cc''
-            ''^src/libstore-test/path-info\.cc''
-            ''^src/libstore-test/path\.cc''
-            ''^src/libstore-test/serve-protocol\.cc''
-            ''^src/libstore-test/worker-protocol\.cc''
-            ''^src/libutil-test-support/tests/characterization\.hh''
-            ''^src/libutil-test-support/tests/hash\.cc''
-            ''^src/libutil-test-support/tests/hash\.hh''
-            ''^src/libutil-test/args\.cc''
-            ''^src/libutil-test/canon-path\.cc''
-            ''^src/libutil-test/chunked-vector\.cc''
-            ''^src/libutil-test/closure\.cc''
-            ''^src/libutil-test/compression\.cc''
-            ''^src/libutil-test/config\.cc''
-            ''^src/libutil-test/file-content-address\.cc''
-            ''^src/libutil-test/git\.cc''
-            ''^src/libutil-test/hash\.cc''
-            ''^src/libutil-test/hilite\.cc''
-            ''^src/libutil-test/json-utils\.cc''
-            ''^src/libutil-test/logging\.cc''
-            ''^src/libutil-test/lru-cache\.cc''
-            ''^src/libutil-test/pool\.cc''
-            ''^src/libutil-test/references\.cc''
-            ''^src/libutil-test/suggestions\.cc''
-            ''^src/libutil-test/tests\.cc''
-            ''^src/libutil-test/url\.cc''
-            ''^src/libutil-test/xml-writer\.cc''
+            ''^src/nix-expr-test-support/tests/libexpr\.hh''
+            ''^src/nix-expr-test-support/tests/value/context\.cc''
+            ''^src/nix-expr-test-support/tests/value/context\.hh''
+            ''^src/nix-expr-tests/derived-path\.cc''
+            ''^src/nix-expr-tests/error_traces\.cc''
+            ''^src/nix-expr-tests/eval\.cc''
+            ''^src/nix-expr-tests/json\.cc''
+            ''^src/nix-expr-tests/main\.cc''
+            ''^src/nix-expr-tests/primops\.cc''
+            ''^src/nix-expr-tests/search-path\.cc''
+            ''^src/nix-expr-tests/trivial\.cc''
+            ''^src/nix-expr-tests/value/context\.cc''
+            ''^src/nix-expr-tests/value/print\.cc''
+            ''^src/nix-fetchers-tests/public-key\.cc''
+            ''^src/nix-flake-tests/flakeref\.cc''
+            ''^src/nix-flake-tests/url-name\.cc''
+            ''^src/nix-store-test-support/tests/derived-path\.cc''
+            ''^src/nix-store-test-support/tests/derived-path\.hh''
+            ''^src/nix-store-test-support/tests/nix_api_store\.hh''
+            ''^src/nix-store-test-support/tests/outputs-spec\.cc''
+            ''^src/nix-store-test-support/tests/outputs-spec\.hh''
+            ''^src/nix-store-test-support/tests/path\.cc''
+            ''^src/nix-store-test-support/tests/path\.hh''
+            ''^src/nix-store-test-support/tests/protocol\.hh''
+            ''^src/nix-store-tests/common-protocol\.cc''
+            ''^src/nix-store-tests/content-address\.cc''
+            ''^src/nix-store-tests/derivation\.cc''
+            ''^src/nix-store-tests/derived-path\.cc''
+            ''^src/nix-store-tests/downstream-placeholder\.cc''
+            ''^src/nix-store-tests/machines\.cc''
+            ''^src/nix-store-tests/nar-info-disk-cache\.cc''
+            ''^src/nix-store-tests/nar-info\.cc''
+            ''^src/nix-store-tests/outputs-spec\.cc''
+            ''^src/nix-store-tests/path-info\.cc''
+            ''^src/nix-store-tests/path\.cc''
+            ''^src/nix-store-tests/serve-protocol\.cc''
+            ''^src/nix-store-tests/worker-protocol\.cc''
+            ''^src/nix-util-test-support/tests/characterization\.hh''
+            ''^src/nix-util-test-support/tests/hash\.cc''
+            ''^src/nix-util-test-support/tests/hash\.hh''
+            ''^src/nix-util-tests/args\.cc''
+            ''^src/nix-util-tests/canon-path\.cc''
+            ''^src/nix-util-tests/chunked-vector\.cc''
+            ''^src/nix-util-tests/closure\.cc''
+            ''^src/nix-util-tests/compression\.cc''
+            ''^src/nix-util-tests/config\.cc''
+            ''^src/nix-util-tests/file-content-address\.cc''
+            ''^src/nix-util-tests/git\.cc''
+            ''^src/nix-util-tests/hash\.cc''
+            ''^src/nix-util-tests/hilite\.cc''
+            ''^src/nix-util-tests/json-utils\.cc''
+            ''^src/nix-util-tests/logging\.cc''
+            ''^src/nix-util-tests/lru-cache\.cc''
+            ''^src/nix-util-tests/pool\.cc''
+            ''^src/nix-util-tests/references\.cc''
+            ''^src/nix-util-tests/suggestions\.cc''
+            ''^src/nix-util-tests/tests\.cc''
+            ''^src/nix-util-tests/url\.cc''
+            ''^src/nix-util-tests/xml-writer\.cc''
           ];
         };
         shellcheck = {
@@ -666,7 +666,7 @@
             ''^tests/functional/user-envs\.sh$''
             ''^tests/functional/why-depends\.sh$''
             ''^tests/functional/zstd\.sh$''
-            ''^src/libutil-test/data/git/check-data\.sh$''
+            ''^src/nix-util-tests/data/git/check-data\.sh$''
           ];
         };
         # TODO: nixfmt, https://github.com/NixOS/nixfmt/issues/153
diff --git a/meson.build b/meson.build
index fb38d7ef2..1690bb50a 100644
--- a/meson.build
+++ b/meson.build
@@ -25,11 +25,11 @@ subproject('libexpr-c')
 subproject('perl')
 
 # Testing
-subproject('libutil-test-support')
-subproject('libutil-test')
-subproject('libstore-test-support')
-subproject('libstore-test')
-subproject('libfetchers-test')
-subproject('libexpr-test-support')
-subproject('libexpr-test')
-subproject('libflake-test')
+subproject('nix-util-test-support')
+subproject('nix-util-tests')
+subproject('nix-store-test-support')
+subproject('nix-store-tests')
+subproject('nix-fetchers-tests')
+subproject('nix-expr-test-support')
+subproject('nix-expr-tests')
+subproject('nix-flake-tests')
diff --git a/packaging/components.nix b/packaging/components.nix
index 73f0d24e1..db50d6b22 100644
--- a/packaging/components.nix
+++ b/packaging/components.nix
@@ -9,24 +9,24 @@ in
 
   nix-util = callPackage ../src/libutil/package.nix { };
   nix-util-c = callPackage ../src/libutil-c/package.nix { };
-  nix-util-test-support = callPackage ../src/libutil-test-support/package.nix { };
-  nix-util-test = callPackage ../src/libutil-test/package.nix { };
+  nix-util-test-support = callPackage ../src/nix-util-test-support/package.nix { };
+  nix-util-tests = callPackage ../src/nix-util-tests/package.nix { };
 
   nix-store = callPackage ../src/libstore/package.nix { };
   nix-store-c = callPackage ../src/libstore-c/package.nix { };
-  nix-store-test-support = callPackage ../src/libstore-test-support/package.nix { };
-  nix-store-test = callPackage ../src/libstore-test/package.nix { };
+  nix-store-test-support = callPackage ../src/nix-store-test-support/package.nix { };
+  nix-store-tests = callPackage ../src/nix-store-tests/package.nix { };
 
   nix-fetchers = callPackage ../src/libfetchers/package.nix { };
-  nix-fetchers-test = callPackage ../src/libfetchers-test/package.nix { };
+  nix-fetchers-tests = callPackage ../src/nix-fetchers-tests/package.nix { };
 
   nix-expr = callPackage ../src/libexpr/package.nix { };
   nix-expr-c = callPackage ../src/libexpr-c/package.nix { };
-  nix-expr-test-support = callPackage ../src/libexpr-test-support/package.nix { };
-  nix-expr-test = callPackage ../src/libexpr-test/package.nix { };
+  nix-expr-test-support = callPackage ../src/nix-expr-test-support/package.nix { };
+  nix-expr-tests = callPackage ../src/nix-expr-tests/package.nix { };
 
   nix-flake = callPackage ../src/libflake/package.nix { };
-  nix-flake-test = callPackage ../src/libflake-test/package.nix { };
+  nix-flake-tests = callPackage ../src/nix-flake-tests/package.nix { };
 
   nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { };
   nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { };
diff --git a/packaging/hydra.nix b/packaging/hydra.nix
index 244a4ad3f..97f2c59b7 100644
--- a/packaging/hydra.nix
+++ b/packaging/hydra.nix
@@ -38,19 +38,19 @@ let
     "nix-util"
     "nix-util-c"
     "nix-util-test-support"
-    "nix-util-test"
+    "nix-util-tests"
     "nix-store"
     "nix-store-c"
     "nix-store-test-support"
-    "nix-store-test"
+    "nix-store-tests"
     "nix-fetchers"
-    "nix-fetchers-test"
+    "nix-fetchers-tests"
     "nix-expr"
     "nix-expr-c"
     "nix-expr-test-support"
-    "nix-expr-test"
+    "nix-expr-tests"
     "nix-flake"
-    "nix-flake-test"
+    "nix-flake-tests"
   ];
 in
 {
diff --git a/src/internal-api-docs/doxygen.cfg.in b/src/internal-api-docs/doxygen.cfg.in
index 395e43fe1..f1ef75b38 100644
--- a/src/internal-api-docs/doxygen.cfg.in
+++ b/src/internal-api-docs/doxygen.cfg.in
@@ -41,21 +41,21 @@ INPUT                  = \
   @src@/libcmd \
   @src@/libexpr \
   @src@/libexpr/flake \
-  @src@/libexpr-test \
-  @src@/libexpr-test/value \
-  @src@/libexpr-test-support/test \
-  @src@/libexpr-test-support/test/value \
+  @src@/nix-expr-tests \
+  @src@/nix-expr-tests/value \
+  @src@/nix-expr-test-support/test \
+  @src@/nix-expr-test-support/test/value \
   @src@/libexpr/value \
   @src@/libfetchers \
   @src@/libmain \
   @src@/libstore \
   @src@/libstore/build \
   @src@/libstore/builtins \
-  @src@/libstore-test \
-  @src@/libstore-test-support/test \
+  @src@/nix-store-tests \
+  @src@/nix-store-test-support/test \
   @src@/libutil \
-  @src@/libutil-test \
-  @src@/libutil-test-support/test \
+  @src@/nix-util-tests \
+  @src@/nix-util-test-support/test \
   @src@/nix \
   @src@/nix-env \
   @src@/nix-store
diff --git a/src/libexpr-test-support/.version b/src/nix-expr-test-support/.version
similarity index 100%
rename from src/libexpr-test-support/.version
rename to src/nix-expr-test-support/.version
diff --git a/src/libexpr-test-support/build-utils-meson b/src/nix-expr-test-support/build-utils-meson
similarity index 100%
rename from src/libexpr-test-support/build-utils-meson
rename to src/nix-expr-test-support/build-utils-meson
diff --git a/src/libexpr-test-support/meson.build b/src/nix-expr-test-support/meson.build
similarity index 100%
rename from src/libexpr-test-support/meson.build
rename to src/nix-expr-test-support/meson.build
diff --git a/src/libexpr-test-support/package.nix b/src/nix-expr-test-support/package.nix
similarity index 100%
rename from src/libexpr-test-support/package.nix
rename to src/nix-expr-test-support/package.nix
diff --git a/src/libexpr-test-support/tests/libexpr.hh b/src/nix-expr-test-support/tests/libexpr.hh
similarity index 100%
rename from src/libexpr-test-support/tests/libexpr.hh
rename to src/nix-expr-test-support/tests/libexpr.hh
diff --git a/src/libexpr-test-support/tests/nix_api_expr.hh b/src/nix-expr-test-support/tests/nix_api_expr.hh
similarity index 100%
rename from src/libexpr-test-support/tests/nix_api_expr.hh
rename to src/nix-expr-test-support/tests/nix_api_expr.hh
diff --git a/src/libexpr-test-support/tests/value/context.cc b/src/nix-expr-test-support/tests/value/context.cc
similarity index 100%
rename from src/libexpr-test-support/tests/value/context.cc
rename to src/nix-expr-test-support/tests/value/context.cc
diff --git a/src/libexpr-test-support/tests/value/context.hh b/src/nix-expr-test-support/tests/value/context.hh
similarity index 100%
rename from src/libexpr-test-support/tests/value/context.hh
rename to src/nix-expr-test-support/tests/value/context.hh
diff --git a/src/libexpr-test/.version b/src/nix-expr-tests/.version
similarity index 100%
rename from src/libexpr-test/.version
rename to src/nix-expr-tests/.version
diff --git a/src/libexpr-test/build-utils-meson b/src/nix-expr-tests/build-utils-meson
similarity index 100%
rename from src/libexpr-test/build-utils-meson
rename to src/nix-expr-tests/build-utils-meson
diff --git a/src/libexpr-test/data/.gitkeep b/src/nix-expr-tests/data/.gitkeep
similarity index 100%
rename from src/libexpr-test/data/.gitkeep
rename to src/nix-expr-tests/data/.gitkeep
diff --git a/src/libexpr-test/derived-path.cc b/src/nix-expr-tests/derived-path.cc
similarity index 100%
rename from src/libexpr-test/derived-path.cc
rename to src/nix-expr-tests/derived-path.cc
diff --git a/src/libexpr-test/error_traces.cc b/src/nix-expr-tests/error_traces.cc
similarity index 100%
rename from src/libexpr-test/error_traces.cc
rename to src/nix-expr-tests/error_traces.cc
diff --git a/src/libexpr-test/eval.cc b/src/nix-expr-tests/eval.cc
similarity index 100%
rename from src/libexpr-test/eval.cc
rename to src/nix-expr-tests/eval.cc
diff --git a/src/libexpr-test/json.cc b/src/nix-expr-tests/json.cc
similarity index 100%
rename from src/libexpr-test/json.cc
rename to src/nix-expr-tests/json.cc
diff --git a/src/libexpr-test/main.cc b/src/nix-expr-tests/main.cc
similarity index 100%
rename from src/libexpr-test/main.cc
rename to src/nix-expr-tests/main.cc
diff --git a/src/libexpr-test/meson.build b/src/nix-expr-tests/meson.build
similarity index 98%
rename from src/libexpr-test/meson.build
rename to src/nix-expr-tests/meson.build
index 04b60f6d6..04b5ae66f 100644
--- a/src/libexpr-test/meson.build
+++ b/src/nix-expr-tests/meson.build
@@ -1,4 +1,4 @@
-project('nix-expr-test', 'cpp',
+project('nix-expr-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',
diff --git a/src/libexpr-test/nix_api_expr.cc b/src/nix-expr-tests/nix_api_expr.cc
similarity index 100%
rename from src/libexpr-test/nix_api_expr.cc
rename to src/nix-expr-tests/nix_api_expr.cc
diff --git a/src/libexpr-test/nix_api_external.cc b/src/nix-expr-tests/nix_api_external.cc
similarity index 100%
rename from src/libexpr-test/nix_api_external.cc
rename to src/nix-expr-tests/nix_api_external.cc
diff --git a/src/libexpr-test/nix_api_value.cc b/src/nix-expr-tests/nix_api_value.cc
similarity index 100%
rename from src/libexpr-test/nix_api_value.cc
rename to src/nix-expr-tests/nix_api_value.cc
diff --git a/src/libexpr-test/package.nix b/src/nix-expr-tests/package.nix
similarity index 97%
rename from src/libexpr-test/package.nix
rename to src/nix-expr-tests/package.nix
index 12f4dd506..679b6fb2a 100644
--- a/src/libexpr-test/package.nix
+++ b/src/nix-expr-tests/package.nix
@@ -39,7 +39,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-expr-test";
+  pname = "nix-expr-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -98,7 +98,7 @@ mkDerivation (finalAttrs: {
       } ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-expr-test
+        nix-expr-tests
         touch $out
       '';
     };
diff --git a/src/libexpr-test/primops.cc b/src/nix-expr-tests/primops.cc
similarity index 100%
rename from src/libexpr-test/primops.cc
rename to src/nix-expr-tests/primops.cc
diff --git a/src/libexpr-test/search-path.cc b/src/nix-expr-tests/search-path.cc
similarity index 100%
rename from src/libexpr-test/search-path.cc
rename to src/nix-expr-tests/search-path.cc
diff --git a/src/libexpr-test/trivial.cc b/src/nix-expr-tests/trivial.cc
similarity index 100%
rename from src/libexpr-test/trivial.cc
rename to src/nix-expr-tests/trivial.cc
diff --git a/src/libexpr-test/value/context.cc b/src/nix-expr-tests/value/context.cc
similarity index 100%
rename from src/libexpr-test/value/context.cc
rename to src/nix-expr-tests/value/context.cc
diff --git a/src/libexpr-test/value/print.cc b/src/nix-expr-tests/value/print.cc
similarity index 100%
rename from src/libexpr-test/value/print.cc
rename to src/nix-expr-tests/value/print.cc
diff --git a/src/libexpr-test/value/value.cc b/src/nix-expr-tests/value/value.cc
similarity index 100%
rename from src/libexpr-test/value/value.cc
rename to src/nix-expr-tests/value/value.cc
diff --git a/src/libfetchers-test/.version b/src/nix-fetchers-tests/.version
similarity index 100%
rename from src/libfetchers-test/.version
rename to src/nix-fetchers-tests/.version
diff --git a/src/libfetchers-test/build-utils-meson b/src/nix-fetchers-tests/build-utils-meson
similarity index 100%
rename from src/libfetchers-test/build-utils-meson
rename to src/nix-fetchers-tests/build-utils-meson
diff --git a/src/libfetchers-test/data/public-key/defaultType.json b/src/nix-fetchers-tests/data/public-key/defaultType.json
similarity index 100%
rename from src/libfetchers-test/data/public-key/defaultType.json
rename to src/nix-fetchers-tests/data/public-key/defaultType.json
diff --git a/src/libfetchers-test/data/public-key/noRoundTrip.json b/src/nix-fetchers-tests/data/public-key/noRoundTrip.json
similarity index 100%
rename from src/libfetchers-test/data/public-key/noRoundTrip.json
rename to src/nix-fetchers-tests/data/public-key/noRoundTrip.json
diff --git a/src/libfetchers-test/data/public-key/simple.json b/src/nix-fetchers-tests/data/public-key/simple.json
similarity index 100%
rename from src/libfetchers-test/data/public-key/simple.json
rename to src/nix-fetchers-tests/data/public-key/simple.json
diff --git a/src/libfetchers-test/meson.build b/src/nix-fetchers-tests/meson.build
similarity index 97%
rename from src/libfetchers-test/meson.build
rename to src/nix-fetchers-tests/meson.build
index 785754b34..c4f18e278 100644
--- a/src/libfetchers-test/meson.build
+++ b/src/nix-fetchers-tests/meson.build
@@ -1,4 +1,4 @@
-project('nix-fetchers-test', 'cpp',
+project('nix-fetchers-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',
diff --git a/src/libfetchers-test/package.nix b/src/nix-fetchers-tests/package.nix
similarity index 97%
rename from src/libfetchers-test/package.nix
rename to src/nix-fetchers-tests/package.nix
index 78d8ab490..5cf18ce33 100644
--- a/src/libfetchers-test/package.nix
+++ b/src/nix-fetchers-tests/package.nix
@@ -38,7 +38,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-fetchers-test";
+  pname = "nix-fetchers-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -96,7 +96,7 @@ mkDerivation (finalAttrs: {
       } ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-fetchers-test
+        nix-fetchers-tests
         touch $out
       '';
     };
diff --git a/src/libfetchers-test/public-key.cc b/src/nix-fetchers-tests/public-key.cc
similarity index 100%
rename from src/libfetchers-test/public-key.cc
rename to src/nix-fetchers-tests/public-key.cc
diff --git a/src/libflake-test/.version b/src/nix-flake-tests/.version
similarity index 100%
rename from src/libflake-test/.version
rename to src/nix-flake-tests/.version
diff --git a/src/libflake-test/build-utils-meson b/src/nix-flake-tests/build-utils-meson
similarity index 100%
rename from src/libflake-test/build-utils-meson
rename to src/nix-flake-tests/build-utils-meson
diff --git a/src/libflake-test/data/.gitkeep b/src/nix-flake-tests/data/.gitkeep
similarity index 100%
rename from src/libflake-test/data/.gitkeep
rename to src/nix-flake-tests/data/.gitkeep
diff --git a/src/libflake-test/flakeref.cc b/src/nix-flake-tests/flakeref.cc
similarity index 100%
rename from src/libflake-test/flakeref.cc
rename to src/nix-flake-tests/flakeref.cc
diff --git a/src/libflake-test/meson.build b/src/nix-flake-tests/meson.build
similarity index 97%
rename from src/libflake-test/meson.build
rename to src/nix-flake-tests/meson.build
index b8221b2ad..5afba2fec 100644
--- a/src/libflake-test/meson.build
+++ b/src/nix-flake-tests/meson.build
@@ -1,4 +1,4 @@
-project('nix-flake-test', 'cpp',
+project('nix-flake-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',
diff --git a/src/libflake-test/package.nix b/src/nix-flake-tests/package.nix
similarity index 97%
rename from src/libflake-test/package.nix
rename to src/nix-flake-tests/package.nix
index 4fb190706..21af753ae 100644
--- a/src/libflake-test/package.nix
+++ b/src/nix-flake-tests/package.nix
@@ -38,7 +38,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-flake-test";
+  pname = "nix-flake-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -96,7 +96,7 @@ mkDerivation (finalAttrs: {
       } ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-flake-test
+        nix-flake-tests
         touch $out
       '';
     };
diff --git a/src/libflake-test/url-name.cc b/src/nix-flake-tests/url-name.cc
similarity index 100%
rename from src/libflake-test/url-name.cc
rename to src/nix-flake-tests/url-name.cc
diff --git a/src/libstore-test-support/.version b/src/nix-store-test-support/.version
similarity index 100%
rename from src/libstore-test-support/.version
rename to src/nix-store-test-support/.version
diff --git a/src/libstore-test-support/build-utils-meson b/src/nix-store-test-support/build-utils-meson
similarity index 100%
rename from src/libstore-test-support/build-utils-meson
rename to src/nix-store-test-support/build-utils-meson
diff --git a/src/libstore-test-support/meson.build b/src/nix-store-test-support/meson.build
similarity index 100%
rename from src/libstore-test-support/meson.build
rename to src/nix-store-test-support/meson.build
diff --git a/src/libstore-test-support/package.nix b/src/nix-store-test-support/package.nix
similarity index 100%
rename from src/libstore-test-support/package.nix
rename to src/nix-store-test-support/package.nix
diff --git a/src/libstore-test-support/tests/derived-path.cc b/src/nix-store-test-support/tests/derived-path.cc
similarity index 100%
rename from src/libstore-test-support/tests/derived-path.cc
rename to src/nix-store-test-support/tests/derived-path.cc
diff --git a/src/libstore-test-support/tests/derived-path.hh b/src/nix-store-test-support/tests/derived-path.hh
similarity index 100%
rename from src/libstore-test-support/tests/derived-path.hh
rename to src/nix-store-test-support/tests/derived-path.hh
diff --git a/src/libstore-test-support/tests/libstore.hh b/src/nix-store-test-support/tests/libstore.hh
similarity index 100%
rename from src/libstore-test-support/tests/libstore.hh
rename to src/nix-store-test-support/tests/libstore.hh
diff --git a/src/libstore-test-support/tests/nix_api_store.hh b/src/nix-store-test-support/tests/nix_api_store.hh
similarity index 100%
rename from src/libstore-test-support/tests/nix_api_store.hh
rename to src/nix-store-test-support/tests/nix_api_store.hh
diff --git a/src/libstore-test-support/tests/outputs-spec.cc b/src/nix-store-test-support/tests/outputs-spec.cc
similarity index 100%
rename from src/libstore-test-support/tests/outputs-spec.cc
rename to src/nix-store-test-support/tests/outputs-spec.cc
diff --git a/src/libstore-test-support/tests/outputs-spec.hh b/src/nix-store-test-support/tests/outputs-spec.hh
similarity index 100%
rename from src/libstore-test-support/tests/outputs-spec.hh
rename to src/nix-store-test-support/tests/outputs-spec.hh
diff --git a/src/libstore-test-support/tests/path.cc b/src/nix-store-test-support/tests/path.cc
similarity index 100%
rename from src/libstore-test-support/tests/path.cc
rename to src/nix-store-test-support/tests/path.cc
diff --git a/src/libstore-test-support/tests/path.hh b/src/nix-store-test-support/tests/path.hh
similarity index 100%
rename from src/libstore-test-support/tests/path.hh
rename to src/nix-store-test-support/tests/path.hh
diff --git a/src/libstore-test-support/tests/protocol.hh b/src/nix-store-test-support/tests/protocol.hh
similarity index 100%
rename from src/libstore-test-support/tests/protocol.hh
rename to src/nix-store-test-support/tests/protocol.hh
diff --git a/src/libstore-test/.version b/src/nix-store-tests/.version
similarity index 100%
rename from src/libstore-test/.version
rename to src/nix-store-tests/.version
diff --git a/src/libstore-test/build-utils-meson b/src/nix-store-tests/build-utils-meson
similarity index 100%
rename from src/libstore-test/build-utils-meson
rename to src/nix-store-tests/build-utils-meson
diff --git a/src/libstore-test/common-protocol.cc b/src/nix-store-tests/common-protocol.cc
similarity index 100%
rename from src/libstore-test/common-protocol.cc
rename to src/nix-store-tests/common-protocol.cc
diff --git a/src/libstore-test/content-address.cc b/src/nix-store-tests/content-address.cc
similarity index 100%
rename from src/libstore-test/content-address.cc
rename to src/nix-store-tests/content-address.cc
diff --git a/src/libstore-test/data/common-protocol/content-address.bin b/src/nix-store-tests/data/common-protocol/content-address.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/content-address.bin
rename to src/nix-store-tests/data/common-protocol/content-address.bin
diff --git a/src/libstore-test/data/common-protocol/drv-output.bin b/src/nix-store-tests/data/common-protocol/drv-output.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/drv-output.bin
rename to src/nix-store-tests/data/common-protocol/drv-output.bin
diff --git a/src/libstore-test/data/common-protocol/optional-content-address.bin b/src/nix-store-tests/data/common-protocol/optional-content-address.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/optional-content-address.bin
rename to src/nix-store-tests/data/common-protocol/optional-content-address.bin
diff --git a/src/libstore-test/data/common-protocol/optional-store-path.bin b/src/nix-store-tests/data/common-protocol/optional-store-path.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/optional-store-path.bin
rename to src/nix-store-tests/data/common-protocol/optional-store-path.bin
diff --git a/src/libstore-test/data/common-protocol/realisation.bin b/src/nix-store-tests/data/common-protocol/realisation.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/realisation.bin
rename to src/nix-store-tests/data/common-protocol/realisation.bin
diff --git a/src/libstore-test/data/common-protocol/set.bin b/src/nix-store-tests/data/common-protocol/set.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/set.bin
rename to src/nix-store-tests/data/common-protocol/set.bin
diff --git a/src/libstore-test/data/common-protocol/store-path.bin b/src/nix-store-tests/data/common-protocol/store-path.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/store-path.bin
rename to src/nix-store-tests/data/common-protocol/store-path.bin
diff --git a/src/libstore-test/data/common-protocol/string.bin b/src/nix-store-tests/data/common-protocol/string.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/string.bin
rename to src/nix-store-tests/data/common-protocol/string.bin
diff --git a/src/libstore-test/data/common-protocol/vector.bin b/src/nix-store-tests/data/common-protocol/vector.bin
similarity index 100%
rename from src/libstore-test/data/common-protocol/vector.bin
rename to src/nix-store-tests/data/common-protocol/vector.bin
diff --git a/src/libstore-test/data/derivation/advanced-attributes-defaults.drv b/src/nix-store-tests/data/derivation/advanced-attributes-defaults.drv
similarity index 100%
rename from src/libstore-test/data/derivation/advanced-attributes-defaults.drv
rename to src/nix-store-tests/data/derivation/advanced-attributes-defaults.drv
diff --git a/src/libstore-test/data/derivation/advanced-attributes-defaults.json b/src/nix-store-tests/data/derivation/advanced-attributes-defaults.json
similarity index 100%
rename from src/libstore-test/data/derivation/advanced-attributes-defaults.json
rename to src/nix-store-tests/data/derivation/advanced-attributes-defaults.json
diff --git a/src/libstore-test/data/derivation/advanced-attributes-structured-attrs-defaults.drv b/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv
similarity index 100%
rename from src/libstore-test/data/derivation/advanced-attributes-structured-attrs-defaults.drv
rename to src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv
diff --git a/src/libstore-test/data/derivation/advanced-attributes-structured-attrs-defaults.json b/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs-defaults.json
similarity index 100%
rename from src/libstore-test/data/derivation/advanced-attributes-structured-attrs-defaults.json
rename to src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs-defaults.json
diff --git a/src/libstore-test/data/derivation/advanced-attributes-structured-attrs.drv b/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs.drv
similarity index 100%
rename from src/libstore-test/data/derivation/advanced-attributes-structured-attrs.drv
rename to src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs.drv
diff --git a/src/libstore-test/data/derivation/advanced-attributes-structured-attrs.json b/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs.json
similarity index 100%
rename from src/libstore-test/data/derivation/advanced-attributes-structured-attrs.json
rename to src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs.json
diff --git a/src/libstore-test/data/derivation/advanced-attributes.drv b/src/nix-store-tests/data/derivation/advanced-attributes.drv
similarity index 100%
rename from src/libstore-test/data/derivation/advanced-attributes.drv
rename to src/nix-store-tests/data/derivation/advanced-attributes.drv
diff --git a/src/libstore-test/data/derivation/bad-old-version-dyn-deps.drv b/src/nix-store-tests/data/derivation/bad-old-version-dyn-deps.drv
similarity index 100%
rename from src/libstore-test/data/derivation/bad-old-version-dyn-deps.drv
rename to src/nix-store-tests/data/derivation/bad-old-version-dyn-deps.drv
diff --git a/src/libstore-test/data/derivation/bad-version.drv b/src/nix-store-tests/data/derivation/bad-version.drv
similarity index 100%
rename from src/libstore-test/data/derivation/bad-version.drv
rename to src/nix-store-tests/data/derivation/bad-version.drv
diff --git a/src/libstore-test/data/derivation/dynDerivationDeps.drv b/src/nix-store-tests/data/derivation/dynDerivationDeps.drv
similarity index 100%
rename from src/libstore-test/data/derivation/dynDerivationDeps.drv
rename to src/nix-store-tests/data/derivation/dynDerivationDeps.drv
diff --git a/src/libstore-test/data/derivation/dynDerivationDeps.json b/src/nix-store-tests/data/derivation/dynDerivationDeps.json
similarity index 100%
rename from src/libstore-test/data/derivation/dynDerivationDeps.json
rename to src/nix-store-tests/data/derivation/dynDerivationDeps.json
diff --git a/src/libstore-test/data/derivation/output-caFixedFlat.json b/src/nix-store-tests/data/derivation/output-caFixedFlat.json
similarity index 100%
rename from src/libstore-test/data/derivation/output-caFixedFlat.json
rename to src/nix-store-tests/data/derivation/output-caFixedFlat.json
diff --git a/src/libstore-test/data/derivation/output-caFixedNAR.json b/src/nix-store-tests/data/derivation/output-caFixedNAR.json
similarity index 100%
rename from src/libstore-test/data/derivation/output-caFixedNAR.json
rename to src/nix-store-tests/data/derivation/output-caFixedNAR.json
diff --git a/src/libstore-test/data/derivation/output-caFixedText.json b/src/nix-store-tests/data/derivation/output-caFixedText.json
similarity index 100%
rename from src/libstore-test/data/derivation/output-caFixedText.json
rename to src/nix-store-tests/data/derivation/output-caFixedText.json
diff --git a/src/libstore-test/data/derivation/output-caFloating.json b/src/nix-store-tests/data/derivation/output-caFloating.json
similarity index 100%
rename from src/libstore-test/data/derivation/output-caFloating.json
rename to src/nix-store-tests/data/derivation/output-caFloating.json
diff --git a/src/libstore-test/data/derivation/output-deferred.json b/src/nix-store-tests/data/derivation/output-deferred.json
similarity index 100%
rename from src/libstore-test/data/derivation/output-deferred.json
rename to src/nix-store-tests/data/derivation/output-deferred.json
diff --git a/src/libstore-test/data/derivation/output-impure.json b/src/nix-store-tests/data/derivation/output-impure.json
similarity index 100%
rename from src/libstore-test/data/derivation/output-impure.json
rename to src/nix-store-tests/data/derivation/output-impure.json
diff --git a/src/libstore-test/data/derivation/output-inputAddressed.json b/src/nix-store-tests/data/derivation/output-inputAddressed.json
similarity index 100%
rename from src/libstore-test/data/derivation/output-inputAddressed.json
rename to src/nix-store-tests/data/derivation/output-inputAddressed.json
diff --git a/src/libstore-test/data/derivation/simple.drv b/src/nix-store-tests/data/derivation/simple.drv
similarity index 100%
rename from src/libstore-test/data/derivation/simple.drv
rename to src/nix-store-tests/data/derivation/simple.drv
diff --git a/src/libstore-test/data/derivation/simple.json b/src/nix-store-tests/data/derivation/simple.json
similarity index 100%
rename from src/libstore-test/data/derivation/simple.json
rename to src/nix-store-tests/data/derivation/simple.json
diff --git a/src/libstore-test/data/machines/bad_format b/src/nix-store-tests/data/machines/bad_format
similarity index 100%
rename from src/libstore-test/data/machines/bad_format
rename to src/nix-store-tests/data/machines/bad_format
diff --git a/src/libstore-test/data/machines/valid b/src/nix-store-tests/data/machines/valid
similarity index 100%
rename from src/libstore-test/data/machines/valid
rename to src/nix-store-tests/data/machines/valid
diff --git a/src/libstore-test/data/nar-info/impure.json b/src/nix-store-tests/data/nar-info/impure.json
similarity index 100%
rename from src/libstore-test/data/nar-info/impure.json
rename to src/nix-store-tests/data/nar-info/impure.json
diff --git a/src/libstore-test/data/nar-info/pure.json b/src/nix-store-tests/data/nar-info/pure.json
similarity index 100%
rename from src/libstore-test/data/nar-info/pure.json
rename to src/nix-store-tests/data/nar-info/pure.json
diff --git a/src/libstore-test/data/path-info/empty_impure.json b/src/nix-store-tests/data/path-info/empty_impure.json
similarity index 100%
rename from src/libstore-test/data/path-info/empty_impure.json
rename to src/nix-store-tests/data/path-info/empty_impure.json
diff --git a/src/libstore-test/data/path-info/empty_pure.json b/src/nix-store-tests/data/path-info/empty_pure.json
similarity index 100%
rename from src/libstore-test/data/path-info/empty_pure.json
rename to src/nix-store-tests/data/path-info/empty_pure.json
diff --git a/src/libstore-test/data/path-info/impure.json b/src/nix-store-tests/data/path-info/impure.json
similarity index 100%
rename from src/libstore-test/data/path-info/impure.json
rename to src/nix-store-tests/data/path-info/impure.json
diff --git a/src/libstore-test/data/path-info/pure.json b/src/nix-store-tests/data/path-info/pure.json
similarity index 100%
rename from src/libstore-test/data/path-info/pure.json
rename to src/nix-store-tests/data/path-info/pure.json
diff --git a/src/libstore-test/data/serve-protocol/build-options-2.1.bin b/src/nix-store-tests/data/serve-protocol/build-options-2.1.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/build-options-2.1.bin
rename to src/nix-store-tests/data/serve-protocol/build-options-2.1.bin
diff --git a/src/libstore-test/data/serve-protocol/build-options-2.2.bin b/src/nix-store-tests/data/serve-protocol/build-options-2.2.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/build-options-2.2.bin
rename to src/nix-store-tests/data/serve-protocol/build-options-2.2.bin
diff --git a/src/libstore-test/data/serve-protocol/build-options-2.3.bin b/src/nix-store-tests/data/serve-protocol/build-options-2.3.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/build-options-2.3.bin
rename to src/nix-store-tests/data/serve-protocol/build-options-2.3.bin
diff --git a/src/libstore-test/data/serve-protocol/build-options-2.7.bin b/src/nix-store-tests/data/serve-protocol/build-options-2.7.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/build-options-2.7.bin
rename to src/nix-store-tests/data/serve-protocol/build-options-2.7.bin
diff --git a/src/libstore-test/data/serve-protocol/build-result-2.2.bin b/src/nix-store-tests/data/serve-protocol/build-result-2.2.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/build-result-2.2.bin
rename to src/nix-store-tests/data/serve-protocol/build-result-2.2.bin
diff --git a/src/libstore-test/data/serve-protocol/build-result-2.3.bin b/src/nix-store-tests/data/serve-protocol/build-result-2.3.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/build-result-2.3.bin
rename to src/nix-store-tests/data/serve-protocol/build-result-2.3.bin
diff --git a/src/libstore-test/data/serve-protocol/build-result-2.6.bin b/src/nix-store-tests/data/serve-protocol/build-result-2.6.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/build-result-2.6.bin
rename to src/nix-store-tests/data/serve-protocol/build-result-2.6.bin
diff --git a/src/libstore-test/data/serve-protocol/content-address.bin b/src/nix-store-tests/data/serve-protocol/content-address.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/content-address.bin
rename to src/nix-store-tests/data/serve-protocol/content-address.bin
diff --git a/src/libstore-test/data/serve-protocol/drv-output.bin b/src/nix-store-tests/data/serve-protocol/drv-output.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/drv-output.bin
rename to src/nix-store-tests/data/serve-protocol/drv-output.bin
diff --git a/src/libstore-test/data/serve-protocol/handshake-to-client.bin b/src/nix-store-tests/data/serve-protocol/handshake-to-client.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/handshake-to-client.bin
rename to src/nix-store-tests/data/serve-protocol/handshake-to-client.bin
diff --git a/src/libstore-test/data/serve-protocol/optional-content-address.bin b/src/nix-store-tests/data/serve-protocol/optional-content-address.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/optional-content-address.bin
rename to src/nix-store-tests/data/serve-protocol/optional-content-address.bin
diff --git a/src/libstore-test/data/serve-protocol/optional-store-path.bin b/src/nix-store-tests/data/serve-protocol/optional-store-path.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/optional-store-path.bin
rename to src/nix-store-tests/data/serve-protocol/optional-store-path.bin
diff --git a/src/libstore-test/data/serve-protocol/realisation.bin b/src/nix-store-tests/data/serve-protocol/realisation.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/realisation.bin
rename to src/nix-store-tests/data/serve-protocol/realisation.bin
diff --git a/src/libstore-test/data/serve-protocol/set.bin b/src/nix-store-tests/data/serve-protocol/set.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/set.bin
rename to src/nix-store-tests/data/serve-protocol/set.bin
diff --git a/src/libstore-test/data/serve-protocol/store-path.bin b/src/nix-store-tests/data/serve-protocol/store-path.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/store-path.bin
rename to src/nix-store-tests/data/serve-protocol/store-path.bin
diff --git a/src/libstore-test/data/serve-protocol/string.bin b/src/nix-store-tests/data/serve-protocol/string.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/string.bin
rename to src/nix-store-tests/data/serve-protocol/string.bin
diff --git a/src/libstore-test/data/serve-protocol/unkeyed-valid-path-info-2.3.bin b/src/nix-store-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/unkeyed-valid-path-info-2.3.bin
rename to src/nix-store-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin
diff --git a/src/libstore-test/data/serve-protocol/unkeyed-valid-path-info-2.4.bin b/src/nix-store-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/unkeyed-valid-path-info-2.4.bin
rename to src/nix-store-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin
diff --git a/src/libstore-test/data/serve-protocol/vector.bin b/src/nix-store-tests/data/serve-protocol/vector.bin
similarity index 100%
rename from src/libstore-test/data/serve-protocol/vector.bin
rename to src/nix-store-tests/data/serve-protocol/vector.bin
diff --git a/src/libstore-test/data/store-reference/auto.txt b/src/nix-store-tests/data/store-reference/auto.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/auto.txt
rename to src/nix-store-tests/data/store-reference/auto.txt
diff --git a/src/libstore-test/data/store-reference/auto_param.txt b/src/nix-store-tests/data/store-reference/auto_param.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/auto_param.txt
rename to src/nix-store-tests/data/store-reference/auto_param.txt
diff --git a/src/libstore-test/data/store-reference/local_1.txt b/src/nix-store-tests/data/store-reference/local_1.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/local_1.txt
rename to src/nix-store-tests/data/store-reference/local_1.txt
diff --git a/src/libstore-test/data/store-reference/local_2.txt b/src/nix-store-tests/data/store-reference/local_2.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/local_2.txt
rename to src/nix-store-tests/data/store-reference/local_2.txt
diff --git a/src/libstore-test/data/store-reference/local_shorthand_1.txt b/src/nix-store-tests/data/store-reference/local_shorthand_1.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/local_shorthand_1.txt
rename to src/nix-store-tests/data/store-reference/local_shorthand_1.txt
diff --git a/src/libstore-test/data/store-reference/local_shorthand_2.txt b/src/nix-store-tests/data/store-reference/local_shorthand_2.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/local_shorthand_2.txt
rename to src/nix-store-tests/data/store-reference/local_shorthand_2.txt
diff --git a/src/libstore-test/data/store-reference/ssh.txt b/src/nix-store-tests/data/store-reference/ssh.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/ssh.txt
rename to src/nix-store-tests/data/store-reference/ssh.txt
diff --git a/src/libstore-test/data/store-reference/unix.txt b/src/nix-store-tests/data/store-reference/unix.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/unix.txt
rename to src/nix-store-tests/data/store-reference/unix.txt
diff --git a/src/libstore-test/data/store-reference/unix_shorthand.txt b/src/nix-store-tests/data/store-reference/unix_shorthand.txt
similarity index 100%
rename from src/libstore-test/data/store-reference/unix_shorthand.txt
rename to src/nix-store-tests/data/store-reference/unix_shorthand.txt
diff --git a/src/libstore-test/data/worker-protocol/build-mode.bin b/src/nix-store-tests/data/worker-protocol/build-mode.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/build-mode.bin
rename to src/nix-store-tests/data/worker-protocol/build-mode.bin
diff --git a/src/libstore-test/data/worker-protocol/build-result-1.27.bin b/src/nix-store-tests/data/worker-protocol/build-result-1.27.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/build-result-1.27.bin
rename to src/nix-store-tests/data/worker-protocol/build-result-1.27.bin
diff --git a/src/libstore-test/data/worker-protocol/build-result-1.28.bin b/src/nix-store-tests/data/worker-protocol/build-result-1.28.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/build-result-1.28.bin
rename to src/nix-store-tests/data/worker-protocol/build-result-1.28.bin
diff --git a/src/libstore-test/data/worker-protocol/build-result-1.29.bin b/src/nix-store-tests/data/worker-protocol/build-result-1.29.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/build-result-1.29.bin
rename to src/nix-store-tests/data/worker-protocol/build-result-1.29.bin
diff --git a/src/libstore-test/data/worker-protocol/build-result-1.37.bin b/src/nix-store-tests/data/worker-protocol/build-result-1.37.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/build-result-1.37.bin
rename to src/nix-store-tests/data/worker-protocol/build-result-1.37.bin
diff --git a/src/libstore-test/data/worker-protocol/client-handshake-info_1_30.bin b/src/nix-store-tests/data/worker-protocol/client-handshake-info_1_30.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/client-handshake-info_1_30.bin
rename to src/nix-store-tests/data/worker-protocol/client-handshake-info_1_30.bin
diff --git a/src/libstore-test/data/worker-protocol/client-handshake-info_1_33.bin b/src/nix-store-tests/data/worker-protocol/client-handshake-info_1_33.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/client-handshake-info_1_33.bin
rename to src/nix-store-tests/data/worker-protocol/client-handshake-info_1_33.bin
diff --git a/src/libstore-test/data/worker-protocol/client-handshake-info_1_35.bin b/src/nix-store-tests/data/worker-protocol/client-handshake-info_1_35.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/client-handshake-info_1_35.bin
rename to src/nix-store-tests/data/worker-protocol/client-handshake-info_1_35.bin
diff --git a/src/libstore-test/data/worker-protocol/content-address.bin b/src/nix-store-tests/data/worker-protocol/content-address.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/content-address.bin
rename to src/nix-store-tests/data/worker-protocol/content-address.bin
diff --git a/src/libstore-test/data/worker-protocol/derived-path-1.29.bin b/src/nix-store-tests/data/worker-protocol/derived-path-1.29.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/derived-path-1.29.bin
rename to src/nix-store-tests/data/worker-protocol/derived-path-1.29.bin
diff --git a/src/libstore-test/data/worker-protocol/derived-path-1.30.bin b/src/nix-store-tests/data/worker-protocol/derived-path-1.30.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/derived-path-1.30.bin
rename to src/nix-store-tests/data/worker-protocol/derived-path-1.30.bin
diff --git a/src/libstore-test/data/worker-protocol/drv-output.bin b/src/nix-store-tests/data/worker-protocol/drv-output.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/drv-output.bin
rename to src/nix-store-tests/data/worker-protocol/drv-output.bin
diff --git a/src/libstore-test/data/worker-protocol/handshake-to-client.bin b/src/nix-store-tests/data/worker-protocol/handshake-to-client.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/handshake-to-client.bin
rename to src/nix-store-tests/data/worker-protocol/handshake-to-client.bin
diff --git a/src/libstore-test/data/worker-protocol/keyed-build-result-1.29.bin b/src/nix-store-tests/data/worker-protocol/keyed-build-result-1.29.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/keyed-build-result-1.29.bin
rename to src/nix-store-tests/data/worker-protocol/keyed-build-result-1.29.bin
diff --git a/src/libstore-test/data/worker-protocol/optional-content-address.bin b/src/nix-store-tests/data/worker-protocol/optional-content-address.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/optional-content-address.bin
rename to src/nix-store-tests/data/worker-protocol/optional-content-address.bin
diff --git a/src/libstore-test/data/worker-protocol/optional-store-path.bin b/src/nix-store-tests/data/worker-protocol/optional-store-path.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/optional-store-path.bin
rename to src/nix-store-tests/data/worker-protocol/optional-store-path.bin
diff --git a/src/libstore-test/data/worker-protocol/optional-trusted-flag.bin b/src/nix-store-tests/data/worker-protocol/optional-trusted-flag.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/optional-trusted-flag.bin
rename to src/nix-store-tests/data/worker-protocol/optional-trusted-flag.bin
diff --git a/src/libstore-test/data/worker-protocol/realisation.bin b/src/nix-store-tests/data/worker-protocol/realisation.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/realisation.bin
rename to src/nix-store-tests/data/worker-protocol/realisation.bin
diff --git a/src/libstore-test/data/worker-protocol/set.bin b/src/nix-store-tests/data/worker-protocol/set.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/set.bin
rename to src/nix-store-tests/data/worker-protocol/set.bin
diff --git a/src/libstore-test/data/worker-protocol/store-path.bin b/src/nix-store-tests/data/worker-protocol/store-path.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/store-path.bin
rename to src/nix-store-tests/data/worker-protocol/store-path.bin
diff --git a/src/libstore-test/data/worker-protocol/string.bin b/src/nix-store-tests/data/worker-protocol/string.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/string.bin
rename to src/nix-store-tests/data/worker-protocol/string.bin
diff --git a/src/libstore-test/data/worker-protocol/unkeyed-valid-path-info-1.15.bin b/src/nix-store-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/unkeyed-valid-path-info-1.15.bin
rename to src/nix-store-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin
diff --git a/src/libstore-test/data/worker-protocol/valid-path-info-1.15.bin b/src/nix-store-tests/data/worker-protocol/valid-path-info-1.15.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/valid-path-info-1.15.bin
rename to src/nix-store-tests/data/worker-protocol/valid-path-info-1.15.bin
diff --git a/src/libstore-test/data/worker-protocol/valid-path-info-1.16.bin b/src/nix-store-tests/data/worker-protocol/valid-path-info-1.16.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/valid-path-info-1.16.bin
rename to src/nix-store-tests/data/worker-protocol/valid-path-info-1.16.bin
diff --git a/src/libstore-test/data/worker-protocol/vector.bin b/src/nix-store-tests/data/worker-protocol/vector.bin
similarity index 100%
rename from src/libstore-test/data/worker-protocol/vector.bin
rename to src/nix-store-tests/data/worker-protocol/vector.bin
diff --git a/src/libstore-test/derivation-advanced-attrs.cc b/src/nix-store-tests/derivation-advanced-attrs.cc
similarity index 100%
rename from src/libstore-test/derivation-advanced-attrs.cc
rename to src/nix-store-tests/derivation-advanced-attrs.cc
diff --git a/src/libstore-test/derivation.cc b/src/nix-store-tests/derivation.cc
similarity index 100%
rename from src/libstore-test/derivation.cc
rename to src/nix-store-tests/derivation.cc
diff --git a/src/libstore-test/derived-path.cc b/src/nix-store-tests/derived-path.cc
similarity index 100%
rename from src/libstore-test/derived-path.cc
rename to src/nix-store-tests/derived-path.cc
diff --git a/src/libstore-test/downstream-placeholder.cc b/src/nix-store-tests/downstream-placeholder.cc
similarity index 100%
rename from src/libstore-test/downstream-placeholder.cc
rename to src/nix-store-tests/downstream-placeholder.cc
diff --git a/src/libstore-test/machines.cc b/src/nix-store-tests/machines.cc
similarity index 100%
rename from src/libstore-test/machines.cc
rename to src/nix-store-tests/machines.cc
diff --git a/src/libstore-test/meson.build b/src/nix-store-tests/meson.build
similarity index 98%
rename from src/libstore-test/meson.build
rename to src/nix-store-tests/meson.build
index 6bf0a5028..2fde70d3b 100644
--- a/src/libstore-test/meson.build
+++ b/src/nix-store-tests/meson.build
@@ -1,4 +1,4 @@
-project('nix-store-test', 'cpp',
+project('nix-store-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',
diff --git a/src/libstore-test/nar-info-disk-cache.cc b/src/nix-store-tests/nar-info-disk-cache.cc
similarity index 100%
rename from src/libstore-test/nar-info-disk-cache.cc
rename to src/nix-store-tests/nar-info-disk-cache.cc
diff --git a/src/libstore-test/nar-info.cc b/src/nix-store-tests/nar-info.cc
similarity index 100%
rename from src/libstore-test/nar-info.cc
rename to src/nix-store-tests/nar-info.cc
diff --git a/src/libstore-test/nix_api_store.cc b/src/nix-store-tests/nix_api_store.cc
similarity index 100%
rename from src/libstore-test/nix_api_store.cc
rename to src/nix-store-tests/nix_api_store.cc
diff --git a/src/libstore-test/outputs-spec.cc b/src/nix-store-tests/outputs-spec.cc
similarity index 100%
rename from src/libstore-test/outputs-spec.cc
rename to src/nix-store-tests/outputs-spec.cc
diff --git a/src/libstore-test/package.nix b/src/nix-store-tests/package.nix
similarity index 98%
rename from src/libstore-test/package.nix
rename to src/nix-store-tests/package.nix
index e37e64886..dc987b3c6 100644
--- a/src/libstore-test/package.nix
+++ b/src/nix-store-tests/package.nix
@@ -40,7 +40,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-store-test";
+  pname = "nix-store-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -105,7 +105,7 @@ mkDerivation (finalAttrs: {
       in runCommand "${finalAttrs.pname}-run" {} ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${data}
-        nix-store-test
+        nix-store-tests
         touch $out
       '';
     };
diff --git a/src/libstore-test/path-info.cc b/src/nix-store-tests/path-info.cc
similarity index 100%
rename from src/libstore-test/path-info.cc
rename to src/nix-store-tests/path-info.cc
diff --git a/src/libstore-test/path.cc b/src/nix-store-tests/path.cc
similarity index 100%
rename from src/libstore-test/path.cc
rename to src/nix-store-tests/path.cc
diff --git a/src/libstore-test/references.cc b/src/nix-store-tests/references.cc
similarity index 100%
rename from src/libstore-test/references.cc
rename to src/nix-store-tests/references.cc
diff --git a/src/libstore-test/serve-protocol.cc b/src/nix-store-tests/serve-protocol.cc
similarity index 100%
rename from src/libstore-test/serve-protocol.cc
rename to src/nix-store-tests/serve-protocol.cc
diff --git a/src/libstore-test/store-reference.cc b/src/nix-store-tests/store-reference.cc
similarity index 100%
rename from src/libstore-test/store-reference.cc
rename to src/nix-store-tests/store-reference.cc
diff --git a/src/libstore-test/worker-protocol.cc b/src/nix-store-tests/worker-protocol.cc
similarity index 100%
rename from src/libstore-test/worker-protocol.cc
rename to src/nix-store-tests/worker-protocol.cc
diff --git a/src/libutil-test-support/.version b/src/nix-util-test-support/.version
similarity index 100%
rename from src/libutil-test-support/.version
rename to src/nix-util-test-support/.version
diff --git a/src/libutil-test-support/build-utils-meson b/src/nix-util-test-support/build-utils-meson
similarity index 100%
rename from src/libutil-test-support/build-utils-meson
rename to src/nix-util-test-support/build-utils-meson
diff --git a/src/libutil-test-support/meson.build b/src/nix-util-test-support/meson.build
similarity index 100%
rename from src/libutil-test-support/meson.build
rename to src/nix-util-test-support/meson.build
diff --git a/src/libutil-test-support/package.nix b/src/nix-util-test-support/package.nix
similarity index 100%
rename from src/libutil-test-support/package.nix
rename to src/nix-util-test-support/package.nix
diff --git a/src/libutil-test-support/tests/characterization.hh b/src/nix-util-test-support/tests/characterization.hh
similarity index 100%
rename from src/libutil-test-support/tests/characterization.hh
rename to src/nix-util-test-support/tests/characterization.hh
diff --git a/src/libutil-test-support/tests/hash.cc b/src/nix-util-test-support/tests/hash.cc
similarity index 100%
rename from src/libutil-test-support/tests/hash.cc
rename to src/nix-util-test-support/tests/hash.cc
diff --git a/src/libutil-test-support/tests/hash.hh b/src/nix-util-test-support/tests/hash.hh
similarity index 100%
rename from src/libutil-test-support/tests/hash.hh
rename to src/nix-util-test-support/tests/hash.hh
diff --git a/src/libutil-test-support/tests/nix_api_util.hh b/src/nix-util-test-support/tests/nix_api_util.hh
similarity index 100%
rename from src/libutil-test-support/tests/nix_api_util.hh
rename to src/nix-util-test-support/tests/nix_api_util.hh
diff --git a/src/libutil-test-support/tests/string_callback.cc b/src/nix-util-test-support/tests/string_callback.cc
similarity index 100%
rename from src/libutil-test-support/tests/string_callback.cc
rename to src/nix-util-test-support/tests/string_callback.cc
diff --git a/src/libutil-test-support/tests/string_callback.hh b/src/nix-util-test-support/tests/string_callback.hh
similarity index 100%
rename from src/libutil-test-support/tests/string_callback.hh
rename to src/nix-util-test-support/tests/string_callback.hh
diff --git a/src/libutil-test/.version b/src/nix-util-tests/.version
similarity index 100%
rename from src/libutil-test/.version
rename to src/nix-util-tests/.version
diff --git a/src/libutil-test/args.cc b/src/nix-util-tests/args.cc
similarity index 100%
rename from src/libutil-test/args.cc
rename to src/nix-util-tests/args.cc
diff --git a/src/libutil-test/build-utils-meson b/src/nix-util-tests/build-utils-meson
similarity index 100%
rename from src/libutil-test/build-utils-meson
rename to src/nix-util-tests/build-utils-meson
diff --git a/src/libutil-test/canon-path.cc b/src/nix-util-tests/canon-path.cc
similarity index 100%
rename from src/libutil-test/canon-path.cc
rename to src/nix-util-tests/canon-path.cc
diff --git a/src/libutil-test/chunked-vector.cc b/src/nix-util-tests/chunked-vector.cc
similarity index 100%
rename from src/libutil-test/chunked-vector.cc
rename to src/nix-util-tests/chunked-vector.cc
diff --git a/src/libutil-test/closure.cc b/src/nix-util-tests/closure.cc
similarity index 100%
rename from src/libutil-test/closure.cc
rename to src/nix-util-tests/closure.cc
diff --git a/src/libutil-test/compression.cc b/src/nix-util-tests/compression.cc
similarity index 100%
rename from src/libutil-test/compression.cc
rename to src/nix-util-tests/compression.cc
diff --git a/src/libutil-test/config.cc b/src/nix-util-tests/config.cc
similarity index 100%
rename from src/libutil-test/config.cc
rename to src/nix-util-tests/config.cc
diff --git a/src/libutil-test/data/git/check-data.sh b/src/nix-util-tests/data/git/check-data.sh
similarity index 100%
rename from src/libutil-test/data/git/check-data.sh
rename to src/nix-util-tests/data/git/check-data.sh
diff --git a/src/libutil-test/data/git/hello-world-blob.bin b/src/nix-util-tests/data/git/hello-world-blob.bin
similarity index 100%
rename from src/libutil-test/data/git/hello-world-blob.bin
rename to src/nix-util-tests/data/git/hello-world-blob.bin
diff --git a/src/libutil-test/data/git/hello-world.bin b/src/nix-util-tests/data/git/hello-world.bin
similarity index 100%
rename from src/libutil-test/data/git/hello-world.bin
rename to src/nix-util-tests/data/git/hello-world.bin
diff --git a/src/libutil-test/data/git/tree.bin b/src/nix-util-tests/data/git/tree.bin
similarity index 100%
rename from src/libutil-test/data/git/tree.bin
rename to src/nix-util-tests/data/git/tree.bin
diff --git a/src/libutil-test/data/git/tree.txt b/src/nix-util-tests/data/git/tree.txt
similarity index 100%
rename from src/libutil-test/data/git/tree.txt
rename to src/nix-util-tests/data/git/tree.txt
diff --git a/src/libutil-test/file-content-address.cc b/src/nix-util-tests/file-content-address.cc
similarity index 100%
rename from src/libutil-test/file-content-address.cc
rename to src/nix-util-tests/file-content-address.cc
diff --git a/src/libutil-test/git.cc b/src/nix-util-tests/git.cc
similarity index 99%
rename from src/libutil-test/git.cc
rename to src/nix-util-tests/git.cc
index 7c360d7c5..24d24a791 100644
--- a/src/libutil-test/git.cc
+++ b/src/nix-util-tests/git.cc
@@ -88,7 +88,7 @@ TEST_F(GitTest, blob_write) {
 /**
  * This data is for "shallow" tree tests. However, we use "real" hashes
  * so that we can check our test data in a small shell script test test
- * (`src/libutil-test/data/git/check-data.sh`).
+ * (`src/nix-util-tests/data/git/check-data.sh`).
  */
 const static Tree tree = {
     {
diff --git a/src/libutil-test/hash.cc b/src/nix-util-tests/hash.cc
similarity index 100%
rename from src/libutil-test/hash.cc
rename to src/nix-util-tests/hash.cc
diff --git a/src/libutil-test/hilite.cc b/src/nix-util-tests/hilite.cc
similarity index 100%
rename from src/libutil-test/hilite.cc
rename to src/nix-util-tests/hilite.cc
diff --git a/src/libutil-test/json-utils.cc b/src/nix-util-tests/json-utils.cc
similarity index 100%
rename from src/libutil-test/json-utils.cc
rename to src/nix-util-tests/json-utils.cc
diff --git a/src/libutil-test/logging.cc b/src/nix-util-tests/logging.cc
similarity index 100%
rename from src/libutil-test/logging.cc
rename to src/nix-util-tests/logging.cc
diff --git a/src/libutil-test/lru-cache.cc b/src/nix-util-tests/lru-cache.cc
similarity index 100%
rename from src/libutil-test/lru-cache.cc
rename to src/nix-util-tests/lru-cache.cc
diff --git a/src/libutil-test/meson.build b/src/nix-util-tests/meson.build
similarity index 98%
rename from src/libutil-test/meson.build
rename to src/nix-util-tests/meson.build
index 19157cda3..67ae48f53 100644
--- a/src/libutil-test/meson.build
+++ b/src/nix-util-tests/meson.build
@@ -1,4 +1,4 @@
-project('nix-util-test', 'cpp',
+project('nix-util-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',
diff --git a/src/libutil-test/nix_api_util.cc b/src/nix-util-tests/nix_api_util.cc
similarity index 100%
rename from src/libutil-test/nix_api_util.cc
rename to src/nix-util-tests/nix_api_util.cc
diff --git a/src/libutil-test/package.nix b/src/nix-util-tests/package.nix
similarity index 97%
rename from src/libutil-test/package.nix
rename to src/nix-util-tests/package.nix
index 396e41f3d..9df8153b6 100644
--- a/src/libutil-test/package.nix
+++ b/src/nix-util-tests/package.nix
@@ -39,7 +39,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-util-test";
+  pname = "nix-util-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -98,7 +98,7 @@ mkDerivation (finalAttrs: {
       } ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-util-test
+        nix-util-tests
         touch $out
       '';
     };
diff --git a/src/libutil-test/pool.cc b/src/nix-util-tests/pool.cc
similarity index 100%
rename from src/libutil-test/pool.cc
rename to src/nix-util-tests/pool.cc
diff --git a/src/libutil-test/references.cc b/src/nix-util-tests/references.cc
similarity index 100%
rename from src/libutil-test/references.cc
rename to src/nix-util-tests/references.cc
diff --git a/src/libutil-test/spawn.cc b/src/nix-util-tests/spawn.cc
similarity index 100%
rename from src/libutil-test/spawn.cc
rename to src/nix-util-tests/spawn.cc
diff --git a/src/libutil-test/suggestions.cc b/src/nix-util-tests/suggestions.cc
similarity index 100%
rename from src/libutil-test/suggestions.cc
rename to src/nix-util-tests/suggestions.cc
diff --git a/src/libutil-test/tests.cc b/src/nix-util-tests/tests.cc
similarity index 100%
rename from src/libutil-test/tests.cc
rename to src/nix-util-tests/tests.cc
diff --git a/src/libutil-test/url.cc b/src/nix-util-tests/url.cc
similarity index 100%
rename from src/libutil-test/url.cc
rename to src/nix-util-tests/url.cc
diff --git a/src/libutil-test/xml-writer.cc b/src/nix-util-tests/xml-writer.cc
similarity index 100%
rename from src/libutil-test/xml-writer.cc
rename to src/nix-util-tests/xml-writer.cc