diff --git a/run_tests.sh b/run_tests.sh
index e0756ad0..b409db83 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -135,7 +135,7 @@ fi
 
 echo "Preparing the environment"
 cd ${BASEDIR}/test/support
-source prepare_db.sh ${PREPARE_DB_OPTS} || die "database preparation failure"
+source prepare_db.sh "${PREPARE_DB_OPTS}" || die "database preparation failure"
 cd -
 
 PATH=node_modules/.bin/:$PATH
diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh
index 7c5ab8d6..95e031f7 100755
--- a/test/support/prepare_db.sh
+++ b/test/support/prepare_db.sh
@@ -25,6 +25,8 @@ while [ -n "$1" ]; do
   elif test "$1" = "--no-sql-download"; then
     DOWNLOAD_SQL_FILES=no
     shift; continue
+  else
+    shift; continue;
   fi
 done