diff --git a/run_tests.sh b/run_tests.sh
index 635d29dd..754bfdf3 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -27,7 +27,7 @@ echo "port ${REDIS_PORT}" | redis-server - > test.log &
 PID_REDIS=$!
 
 echo "Preparing the database"
-cd test; sh prepare_db.sh >> test.log || die "database preparation failure (see test.log)"; cd -;
+cd test/support; sh prepare_db.sh >> test.log || die "database preparation failure (see test.log)"; cd -;
 
 PATH=node_modules/.bin/:$PATH
 
diff --git a/test/prepare_db.sh b/test/support/prepare_db.sh
similarity index 100%
rename from test/prepare_db.sh
rename to test/support/prepare_db.sh
diff --git a/test/sql/gadm4.sql b/test/support/sql/gadm4.sql
similarity index 100%
rename from test/sql/gadm4.sql
rename to test/support/sql/gadm4.sql
diff --git a/test/sql/windshaft.test.sql b/test/support/sql/windshaft.test.sql
similarity index 100%
rename from test/sql/windshaft.test.sql
rename to test/support/sql/windshaft.test.sql