diff --git a/db/scripts/create-prod-db.sh b/db/scripts/create-prod-db.sh
index 6652a42..ede56f6 100755
--- a/db/scripts/create-prod-db.sh
+++ b/db/scripts/create-prod-db.sh
@@ -16,7 +16,7 @@ DO $$ BEGIN
 END $$;
 SQL
 
-for f in db/init/*.sql; do
+for f in `dirname($0)`/*.sql; do
   echo "Applying $f"
   psql -d "$DB_NAME" -f "$f"
 done
diff --git a/db/scripts/create-test-db.sh b/db/scripts/create-test-db.sh
index 1329022..b1ac32d 100755
--- a/db/scripts/create-test-db.sh
+++ b/db/scripts/create-test-db.sh
@@ -9,7 +9,10 @@ DROP DATABASE IF EXISTS "$DB_NAME";
 CREATE DATABASE "$DB_NAME" OWNER "$ROLE";
 SQL
 
-for f in db/init/*.sql; do
+for f in `dirname($0)`/*.sql; do
+  if [[ "$f" == *"001_roles.sql"* ]]; then
+    continue
+  fi
   echo "Applying $f"
   psql -d "$DB_NAME" -f "$f"
 done