diff --git a/default.nix b/default.nix
index 85fb530a3..84e1d53cc 100644
--- a/default.nix
+++ b/default.nix
@@ -104,21 +104,21 @@ rec {
 
   # Docker images and loading script.
   docker =
-    pkgs.callPackage nix/docker { postgrest = postgrestStatic; };
+    pkgs.callPackage nix/tools/docker { postgrest = postgrestStatic; };
 
   env =
     postgrest.env;
 
   # Utility for updating the pinned version of Nixpkgs.
   nixpkgsTools =
-    pkgs.callPackage nix/nixpkgstools.nix { };
+    pkgs.callPackage nix/tools/nixpkgstools.nix { };
 
   withTools =
-    pkgs.callPackage nix/withtools.nix { inherit postgresqlVersions; };
+    pkgs.callPackage nix/tools/withtools.nix { inherit postgresqlVersions; };
 
   # Scripts for running tests.
   tests =
-    pkgs.callPackage nix/tests.nix {
+    pkgs.callPackage nix/tools/tests.nix {
       inherit postgrest devCabalOptions withTools;
       ghc = pkgs.haskell.compiler."${compiler}";
       hpc-codecov = pkgs.haskell.packages."${compiler}".hpc-codecov;
@@ -126,11 +126,11 @@ rec {
 
   # Script for running memory tests.
   memory =
-    pkgs.callPackage nix/memory.nix { inherit postgrestProfiled withTools; };
+    pkgs.callPackage nix/tools/memory.nix { inherit postgrestProfiled withTools; };
 
-  # Linting and styling scripts.
+  # Linting and styling tools.
   style =
-    pkgs.callPackage nix/style.nix { };
+    pkgs.callPackage nix/tools/style.nix { };
 
   # Tooling for analyzing Haskell imports and exports.
   hsie =
@@ -138,13 +138,13 @@ rec {
       ghcWithPackages = pkgs.haskell.packages."${compiler}".ghcWithPackages;
     };
 
-  # Development tools, including linting and styling scripts.
+  # Development tools.
   devtools =
-    pkgs.callPackage nix/devtools.nix { inherit tests style devCabalOptions hsie; };
+    pkgs.callPackage nix/tools/devtools.nix { inherit tests style devCabalOptions hsie; };
 
   # Scripts for publishing new releases.
   release =
-    pkgs.callPackage nix/release {
+    pkgs.callPackage nix/tools/release {
       inherit docker;
       postgrest = postgrestStatic;
     };
diff --git a/nix/devtools.nix b/nix/tools/devtools.nix
similarity index 100%
rename from nix/devtools.nix
rename to nix/tools/devtools.nix
diff --git a/nix/docker/README.md b/nix/tools/docker/README.md
similarity index 100%
rename from nix/docker/README.md
rename to nix/tools/docker/README.md
diff --git a/nix/docker/default.nix b/nix/tools/docker/default.nix
similarity index 100%
rename from nix/docker/default.nix
rename to nix/tools/docker/default.nix
diff --git a/nix/memory.nix b/nix/tools/memory.nix
similarity index 100%
rename from nix/memory.nix
rename to nix/tools/memory.nix
diff --git a/nix/nixpkgstools.nix b/nix/tools/nixpkgstools.nix
similarity index 100%
rename from nix/nixpkgstools.nix
rename to nix/tools/nixpkgstools.nix
diff --git a/nix/release/default.nix b/nix/tools/release/default.nix
similarity index 99%
rename from nix/release/default.nix
rename to nix/tools/release/default.nix
index 8c9cfac77..161e3484b 100644
--- a/nix/release/default.nix
+++ b/nix/tools/release/default.nix
@@ -44,7 +44,7 @@ let
             --replace nightly \
             "postgrest-nightly-$suffix-linux-x64-static.tar.xz"
         else
-          changes="$(sed -n "1,/$_arg_version/d;/## \[/q;p" ${../../CHANGELOG.md})"
+          changes="$(sed -n "1,/$_arg_version/d;/## \[/q;p" ${../../../CHANGELOG.md})"
 
           tar cvJf "postgrest-$_arg_version-linux-x64-static.tar.xz" \
             -C ${postgrest}/bin postgrest
diff --git a/nix/release/docker-hub-description.md b/nix/tools/release/docker-hub-description.md
similarity index 100%
rename from nix/release/docker-hub-description.md
rename to nix/tools/release/docker-hub-description.md
diff --git a/nix/release/docker-hub-full-description.md b/nix/tools/release/docker-hub-full-description.md
similarity index 100%
rename from nix/release/docker-hub-full-description.md
rename to nix/tools/release/docker-hub-full-description.md
diff --git a/nix/style.nix b/nix/tools/style.nix
similarity index 100%
rename from nix/style.nix
rename to nix/tools/style.nix
diff --git a/nix/tests.nix b/nix/tools/tests.nix
similarity index 100%
rename from nix/tests.nix
rename to nix/tools/tests.nix
diff --git a/nix/withtools.nix b/nix/tools/withtools.nix
similarity index 96%
rename from nix/withtools.nix
rename to nix/tools/withtools.nix
index 8851cd3f8..c3ee30e6f 100644
--- a/nix/withtools.nix
+++ b/nix/tools/withtools.nix
@@ -27,7 +27,7 @@ let
         if test ! -v PGRST_DB_URI; then
           export PATH=${postgresql}/bin:"$PATH"
 
-          exec ${../test/with_tmp_db} "$_arg_command" "''${_arg_leftovers[@]}"
+          exec ${../../test/with_tmp_db} "$_arg_command" "''${_arg_leftovers[@]}"
         else
           "$@"
         fi