diff --git a/mk/programs.mk b/mk/programs.mk
index a88d9d949..7768ef3eb 100644
--- a/mk/programs.mk
+++ b/mk/programs.mk
@@ -6,6 +6,9 @@ programs-list :=
 # - $(1)_NAME: the name of the program (e.g. ‘foo’); defaults to
 #   $(1).
 #
+# - $(1)_ENV: environment variables to set when running the program
+#   from the Makefile using the $(1)_RUN target.
+#
 # - $(1)_DIR: the directory where the (non-installed) program will be
 #   placed.
 #
@@ -87,6 +90,6 @@ define build-program
   # Phony target to run this program (typically as a dependency of 'check').
   .PHONY: $(1)_RUN
   $(1)_RUN: $$($(1)_PATH)
-	$(trace-test) $$(UNIT_TEST_ENV) $$($(1)_PATH)
+	$(trace-test) $$($(1)_ENV) $$($(1)_PATH)
 
 endef
diff --git a/package.nix b/package.nix
index 06d644627..482861379 100644
--- a/package.nix
+++ b/package.nix
@@ -106,7 +106,6 @@ in stdenv.mkDerivation (finalAttrs: {
       configureFiles
       topLevelBuildFiles
       functionalTestFiles
-      ./unit-test-data
     ] ++ lib.optionals (!finalAttrs.dontBuild || internalApiDocs) [
       ./boehmgc-coroutine-sp-fallback.diff
       ./doc
diff --git a/unit-test-data/libstore/common-protocol/content-address.bin b/tests/unit/libstore/data/libstore/common-protocol/content-address.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/content-address.bin
rename to tests/unit/libstore/data/libstore/common-protocol/content-address.bin
diff --git a/unit-test-data/libstore/common-protocol/drv-output.bin b/tests/unit/libstore/data/libstore/common-protocol/drv-output.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/drv-output.bin
rename to tests/unit/libstore/data/libstore/common-protocol/drv-output.bin
diff --git a/unit-test-data/libstore/common-protocol/optional-content-address.bin b/tests/unit/libstore/data/libstore/common-protocol/optional-content-address.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/optional-content-address.bin
rename to tests/unit/libstore/data/libstore/common-protocol/optional-content-address.bin
diff --git a/unit-test-data/libstore/common-protocol/optional-store-path.bin b/tests/unit/libstore/data/libstore/common-protocol/optional-store-path.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/optional-store-path.bin
rename to tests/unit/libstore/data/libstore/common-protocol/optional-store-path.bin
diff --git a/unit-test-data/libstore/common-protocol/realisation.bin b/tests/unit/libstore/data/libstore/common-protocol/realisation.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/realisation.bin
rename to tests/unit/libstore/data/libstore/common-protocol/realisation.bin
diff --git a/unit-test-data/libstore/common-protocol/set.bin b/tests/unit/libstore/data/libstore/common-protocol/set.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/set.bin
rename to tests/unit/libstore/data/libstore/common-protocol/set.bin
diff --git a/unit-test-data/libstore/common-protocol/store-path.bin b/tests/unit/libstore/data/libstore/common-protocol/store-path.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/store-path.bin
rename to tests/unit/libstore/data/libstore/common-protocol/store-path.bin
diff --git a/unit-test-data/libstore/common-protocol/string.bin b/tests/unit/libstore/data/libstore/common-protocol/string.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/string.bin
rename to tests/unit/libstore/data/libstore/common-protocol/string.bin
diff --git a/unit-test-data/libstore/common-protocol/vector.bin b/tests/unit/libstore/data/libstore/common-protocol/vector.bin
similarity index 100%
rename from unit-test-data/libstore/common-protocol/vector.bin
rename to tests/unit/libstore/data/libstore/common-protocol/vector.bin
diff --git a/unit-test-data/libstore/derivation/bad-old-version-dyn-deps.drv b/tests/unit/libstore/data/libstore/derivation/bad-old-version-dyn-deps.drv
similarity index 100%
rename from unit-test-data/libstore/derivation/bad-old-version-dyn-deps.drv
rename to tests/unit/libstore/data/libstore/derivation/bad-old-version-dyn-deps.drv
diff --git a/unit-test-data/libstore/derivation/bad-version.drv b/tests/unit/libstore/data/libstore/derivation/bad-version.drv
similarity index 100%
rename from unit-test-data/libstore/derivation/bad-version.drv
rename to tests/unit/libstore/data/libstore/derivation/bad-version.drv
diff --git a/unit-test-data/libstore/derivation/dynDerivationDeps.drv b/tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.drv
similarity index 100%
rename from unit-test-data/libstore/derivation/dynDerivationDeps.drv
rename to tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.drv
diff --git a/unit-test-data/libstore/derivation/dynDerivationDeps.json b/tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.json
similarity index 100%
rename from unit-test-data/libstore/derivation/dynDerivationDeps.json
rename to tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.json
diff --git a/unit-test-data/libstore/derivation/output-caFixedFlat.json b/tests/unit/libstore/data/libstore/derivation/output-caFixedFlat.json
similarity index 100%
rename from unit-test-data/libstore/derivation/output-caFixedFlat.json
rename to tests/unit/libstore/data/libstore/derivation/output-caFixedFlat.json
diff --git a/unit-test-data/libstore/derivation/output-caFixedNAR.json b/tests/unit/libstore/data/libstore/derivation/output-caFixedNAR.json
similarity index 100%
rename from unit-test-data/libstore/derivation/output-caFixedNAR.json
rename to tests/unit/libstore/data/libstore/derivation/output-caFixedNAR.json
diff --git a/unit-test-data/libstore/derivation/output-caFixedText.json b/tests/unit/libstore/data/libstore/derivation/output-caFixedText.json
similarity index 100%
rename from unit-test-data/libstore/derivation/output-caFixedText.json
rename to tests/unit/libstore/data/libstore/derivation/output-caFixedText.json
diff --git a/unit-test-data/libstore/derivation/output-caFloating.json b/tests/unit/libstore/data/libstore/derivation/output-caFloating.json
similarity index 100%
rename from unit-test-data/libstore/derivation/output-caFloating.json
rename to tests/unit/libstore/data/libstore/derivation/output-caFloating.json
diff --git a/unit-test-data/libstore/derivation/output-deferred.json b/tests/unit/libstore/data/libstore/derivation/output-deferred.json
similarity index 100%
rename from unit-test-data/libstore/derivation/output-deferred.json
rename to tests/unit/libstore/data/libstore/derivation/output-deferred.json
diff --git a/unit-test-data/libstore/derivation/output-impure.json b/tests/unit/libstore/data/libstore/derivation/output-impure.json
similarity index 100%
rename from unit-test-data/libstore/derivation/output-impure.json
rename to tests/unit/libstore/data/libstore/derivation/output-impure.json
diff --git a/unit-test-data/libstore/derivation/output-inputAddressed.json b/tests/unit/libstore/data/libstore/derivation/output-inputAddressed.json
similarity index 100%
rename from unit-test-data/libstore/derivation/output-inputAddressed.json
rename to tests/unit/libstore/data/libstore/derivation/output-inputAddressed.json
diff --git a/unit-test-data/libstore/derivation/simple.drv b/tests/unit/libstore/data/libstore/derivation/simple.drv
similarity index 100%
rename from unit-test-data/libstore/derivation/simple.drv
rename to tests/unit/libstore/data/libstore/derivation/simple.drv
diff --git a/unit-test-data/libstore/derivation/simple.json b/tests/unit/libstore/data/libstore/derivation/simple.json
similarity index 100%
rename from unit-test-data/libstore/derivation/simple.json
rename to tests/unit/libstore/data/libstore/derivation/simple.json
diff --git a/unit-test-data/libstore/serve-protocol/build-result-2.2.bin b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.2.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/build-result-2.2.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/build-result-2.2.bin
diff --git a/unit-test-data/libstore/serve-protocol/build-result-2.3.bin b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.3.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/build-result-2.3.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/build-result-2.3.bin
diff --git a/unit-test-data/libstore/serve-protocol/build-result-2.6.bin b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.6.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/build-result-2.6.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/build-result-2.6.bin
diff --git a/unit-test-data/libstore/serve-protocol/content-address.bin b/tests/unit/libstore/data/libstore/serve-protocol/content-address.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/content-address.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/content-address.bin
diff --git a/unit-test-data/libstore/serve-protocol/drv-output.bin b/tests/unit/libstore/data/libstore/serve-protocol/drv-output.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/drv-output.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/drv-output.bin
diff --git a/unit-test-data/libstore/serve-protocol/optional-content-address.bin b/tests/unit/libstore/data/libstore/serve-protocol/optional-content-address.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/optional-content-address.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/optional-content-address.bin
diff --git a/unit-test-data/libstore/serve-protocol/optional-store-path.bin b/tests/unit/libstore/data/libstore/serve-protocol/optional-store-path.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/optional-store-path.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/optional-store-path.bin
diff --git a/unit-test-data/libstore/serve-protocol/realisation.bin b/tests/unit/libstore/data/libstore/serve-protocol/realisation.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/realisation.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/realisation.bin
diff --git a/unit-test-data/libstore/serve-protocol/set.bin b/tests/unit/libstore/data/libstore/serve-protocol/set.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/set.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/set.bin
diff --git a/unit-test-data/libstore/serve-protocol/store-path.bin b/tests/unit/libstore/data/libstore/serve-protocol/store-path.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/store-path.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/store-path.bin
diff --git a/unit-test-data/libstore/serve-protocol/string.bin b/tests/unit/libstore/data/libstore/serve-protocol/string.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/string.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/string.bin
diff --git a/unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin b/tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin
diff --git a/unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin b/tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin
diff --git a/unit-test-data/libstore/serve-protocol/vector.bin b/tests/unit/libstore/data/libstore/serve-protocol/vector.bin
similarity index 100%
rename from unit-test-data/libstore/serve-protocol/vector.bin
rename to tests/unit/libstore/data/libstore/serve-protocol/vector.bin
diff --git a/unit-test-data/libstore/worker-protocol/build-result-1.27.bin b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.27.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/build-result-1.27.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/build-result-1.27.bin
diff --git a/unit-test-data/libstore/worker-protocol/build-result-1.28.bin b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.28.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/build-result-1.28.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/build-result-1.28.bin
diff --git a/unit-test-data/libstore/worker-protocol/build-result-1.29.bin b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.29.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/build-result-1.29.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/build-result-1.29.bin
diff --git a/unit-test-data/libstore/worker-protocol/content-address.bin b/tests/unit/libstore/data/libstore/worker-protocol/content-address.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/content-address.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/content-address.bin
diff --git a/unit-test-data/libstore/worker-protocol/derived-path-1.29.bin b/tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.29.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/derived-path-1.29.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.29.bin
diff --git a/unit-test-data/libstore/worker-protocol/derived-path-1.30.bin b/tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.30.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/derived-path-1.30.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.30.bin
diff --git a/unit-test-data/libstore/worker-protocol/drv-output.bin b/tests/unit/libstore/data/libstore/worker-protocol/drv-output.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/drv-output.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/drv-output.bin
diff --git a/unit-test-data/libstore/worker-protocol/keyed-build-result-1.29.bin b/tests/unit/libstore/data/libstore/worker-protocol/keyed-build-result-1.29.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/keyed-build-result-1.29.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/keyed-build-result-1.29.bin
diff --git a/unit-test-data/libstore/worker-protocol/optional-content-address.bin b/tests/unit/libstore/data/libstore/worker-protocol/optional-content-address.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/optional-content-address.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/optional-content-address.bin
diff --git a/unit-test-data/libstore/worker-protocol/optional-store-path.bin b/tests/unit/libstore/data/libstore/worker-protocol/optional-store-path.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/optional-store-path.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/optional-store-path.bin
diff --git a/unit-test-data/libstore/worker-protocol/optional-trusted-flag.bin b/tests/unit/libstore/data/libstore/worker-protocol/optional-trusted-flag.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/optional-trusted-flag.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/optional-trusted-flag.bin
diff --git a/unit-test-data/libstore/worker-protocol/realisation.bin b/tests/unit/libstore/data/libstore/worker-protocol/realisation.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/realisation.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/realisation.bin
diff --git a/unit-test-data/libstore/worker-protocol/set.bin b/tests/unit/libstore/data/libstore/worker-protocol/set.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/set.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/set.bin
diff --git a/unit-test-data/libstore/worker-protocol/store-path.bin b/tests/unit/libstore/data/libstore/worker-protocol/store-path.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/store-path.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/store-path.bin
diff --git a/unit-test-data/libstore/worker-protocol/string.bin b/tests/unit/libstore/data/libstore/worker-protocol/string.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/string.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/string.bin
diff --git a/unit-test-data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin b/tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
diff --git a/unit-test-data/libstore/worker-protocol/valid-path-info-1.15.bin b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.15.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/valid-path-info-1.15.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.15.bin
diff --git a/unit-test-data/libstore/worker-protocol/valid-path-info-1.16.bin b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.16.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/valid-path-info-1.16.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.16.bin
diff --git a/unit-test-data/libstore/worker-protocol/vector.bin b/tests/unit/libstore/data/libstore/worker-protocol/vector.bin
similarity index 100%
rename from unit-test-data/libstore/worker-protocol/vector.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/vector.bin