diff --git a/nix/tools/withTools.nix b/nix/tools/withTools.nix
index 1f3f2a801..e64bd5f5b 100644
--- a/nix/tools/withTools.nix
+++ b/nix/tools/withTools.nix
@@ -72,6 +72,7 @@ let
         stop () {
           log "Stopping the database cluster..."
           pg_ctl stop -m i >> "$setuplog"
+          rm -rf "$tmpdir/db"
         }
         trap stop EXIT