diff --git a/makefile b/makefile
index ffc7896bd6f553949993b08c1f716afd95c0e85f..0c9ddabafadaacf14a122ea1c0df9463558219ac 100644
--- a/makefile
+++ b/makefile
@@ -26,7 +26,7 @@ INSTALL_SQL_FILE=db_2_0.sql
 
 .PHONY: test-connection
 test-connection:
-	./make_db test-connection
+	./utils/make_db test-connection
 
 .PHONY: upgrade
 upgrade:
@@ -37,17 +37,17 @@ install: _install _grant upgrade
 
 .PHONY: _install
 _install:
-	./make_db install_db
+	./utils/make_db install_db
 
 .PHONY: _grant
 _grant:
-	./make_db grant
+	./utils/make_db grant
 
 # Drop the user and a given database
 .PHONY: drop-%
 drop-%:
-	./make_db drop $(patsubst drop-%,%,$@)
+	./utils/make_db drop $(patsubst drop-%,%,$@)
 
 .PHONY: test
 test:
-	./make_db test --fresh
+	./utils/make_db test --fresh
diff --git a/make_db b/utils/make_db
similarity index 99%
rename from make_db
rename to utils/make_db
index d93958692137e759925dcaca76e586771b9f6857..72a49dab721d337340f37aebe7fcc3231da9e40a 100755
--- a/make_db
+++ b/utils/make_db
@@ -25,7 +25,7 @@
 INSTALL_SQL_FILE="db_2_0.sql"
 
 if [ -z "$UTILSPATH" ]; then
-	UTILSPATH="$(realpath $(dirname $0))/utils"
+	UTILSPATH="$(realpath $(dirname $0))"
 	export UTILSPATH
 fi