diff --git a/tools/ssb-tools/load-ssb-flat-data.sh b/tools/ssb-tools/load-ssb-flat-data.sh
index 42c9882884..af8917109f 100755
--- a/tools/ssb-tools/load-ssb-flat-data.sh
+++ b/tools/ssb-tools/load-ssb-flat-data.sh
@@ -82,7 +82,11 @@ check_prerequest() {
 run_sql() {
     sql="$@"
     echo $sql
-    mysql -h$FE_HOST -u$USER -P$FE_QUERY_PORT -D$DB -e "$@"
+    if [ -z $PASSWORD ]; then
+        mysql -h$FE_HOST -u$USER -P$FE_QUERY_PORT -D$DB -e "$@"
+    else
+        mysql -h$FE_HOST -u$USER -P$FE_QUERY_PORT -D$DB -p$PASSWORD -e "$@"
+    fi
 }
 
 load_lineitem_flat() {
diff --git a/tools/tpch-tools/run-tpch-queries.sh b/tools/tpch-tools/run-tpch-queries.sh
index c384a2132a..95b93ee4c5 100755
--- a/tools/tpch-tools/run-tpch-queries.sh
+++ b/tools/tpch-tools/run-tpch-queries.sh
@@ -106,7 +106,11 @@ for i in $(seq 1 22); do
     # Each query is executed ${run} times and takes the average time
     for j in $(seq 1 ${run}); do
         start=$(date +%s%3N)
-        mysql -h$FE_HOST -u $USER -P$FE_QUERY_PORT -D$DB <$QUERIES_DIR/q$i.sql >/dev/null
+        if [ -z $PASSWORD ]; then
+            mysql -h$FE_HOST -u $USER -P$FE_QUERY_PORT -D$DB --comments <$QUERIES_DIR/q$i.sql >/dev/null
+        else
+            mysql -h$FE_HOST -u $USER -P$FE_QUERY_PORT -D$DB -p$PASSWORD --comments <$QUERIES_DIR/q$i.sql >/dev/null
+        fi
         end=$(date +%s%3N)
         total=$((total + end - start))
     done