diff --git a/test/cluster/check_all_nodes.bash b/test/cluster/check_all_nodes.bash
old mode 100644
new mode 100755
index 1953e252e..1428b9cc3
--- a/test/cluster/check_all_nodes.bash
+++ b/test/cluster/check_all_nodes.bash
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 TABLES=(mysql_servers mysql_users mysql_query_rules mysql_query_rules_fast_routing global_variables proxysql_servers mysql_galera_hostgroups mysql_group_replication_hostgroups mysql_replication_hostgroups mysql_hostgroup_attributes)
 
 ALL_TABLES=()
@@ -8,12 +9,8 @@ for i in ${!TABLES[@]} ; do
 	ALL_TABLES+=("runtime_"${TABLES[$i]})
 done
 
-#for i in ${!ALL_TABLES[@]} ; do
-#	echo "SELECT * FROM ${ALL_TABLES[$i]};"
-#done
-
-for p in 6032 `seq 26001 26009` ; do
+for p in 6032 $(seq 26001 26009) ; do
 	for i in ${!ALL_TABLES[@]} ; do
 		echo "SELECT COUNT(*) FROM ${ALL_TABLES[$i]};"
-	done | mysql -u admin -padmin -h 127.0.0.1 -P$p > /dev/null 2> /dev/null &
+	done | mysql -u admin -padmin -h 127.0.0.1 -P$p &> /dev/null &
 done
diff --git a/test/cluster/install_scheduler.bash b/test/cluster/install_scheduler.bash
old mode 100644
new mode 100755
index 01c6a1d2a..36ee568d4
--- a/test/cluster/install_scheduler.bash
+++ b/test/cluster/install_scheduler.bash
@@ -1,8 +1,19 @@
-#/bin/bash
+#!/usr/bin/env bash
+
 cp -f check_all_nodes.bash /tmp/check_all_nodes.bash
 chmod +x /tmp/check_all_nodes.bash
-mysql -u admin -padmin -h 127.0.0.1 -P6032 -e "INSERT INTO scheduler (interval_ms, filename) VALUES (12000, '/tmp/check_all_nodes.bash'); LOAD SCHEDULER TO RUNTIME; SAVE SCHEDULER TO DISK;"
+
+mysql -u admin -padmin -h 127.0.0.1 -P6032 -e "\
+INSERT INTO scheduler (interval_ms, filename) VALUES (12000, '/tmp/check_all_nodes.bash'); \
+LOAD SCHEDULER TO RUNTIME; \
+SAVE SCHEDULER TO DISK; \
+" 2>&1 | grep -v "Using a password"
+
 for i in 1 2 3; do
-sleep 3
-mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "INSERT INTO scheduler (interval_ms, filename) VALUES (12000, '/tmp/check_all_nodes.bash'); LOAD SCHEDULER TO RUNTIME; SAVE SCHEDULER TO DISK;"
+	sleep 3
+	mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "\
+INSERT INTO scheduler (interval_ms, filename) VALUES (12000, '/tmp/check_all_nodes.bash'); \
+LOAD SCHEDULER TO RUNTIME; \
+SAVE SCHEDULER TO DISK; \
+" 2>&1 | grep -v "Using a password"
 done
diff --git a/test/cluster/rolling_restart.sh b/test/cluster/rolling_restart.sh
index 26760991c..ac33b217c 100755
--- a/test/cluster/rolling_restart.sh
+++ b/test/cluster/rolling_restart.sh
@@ -1,9 +1,11 @@
-#/bin/bash
+#!/usr/bin/env bash
+
 echo "IGNORE errors like 'Lost connection to MySQL server during query'"
+
 echo "Rolling restarting the core nodes"
 for i in `seq 1 3` ; do
 	echo "  restarting node $i ... "
-	mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "PROXYSQL SHUTDOWN SLOW"
+	mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "PROXYSQL SHUTDOWN SLOW" 2>&1 | grep -v "Using a password"
 	sleep 1
 	../../src/proxysql -M -D $PWD/node0$i -c confs/proxysql0$i.cfg 2> /dev/null
 	echo "Done!"
@@ -14,7 +16,7 @@ done
 echo "Rolling restarting the satellite nodes"
 for i in `seq 4 9` ; do
 	echo "  restarting node $i ... "
-	mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "PROXYSQL SHUTDOWN SLOW"
+	mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "PROXYSQL SHUTDOWN SLOW" 2>&1 | grep -v "Using a password"
 	sleep 1
 	../../src/proxysql -M -D $PWD/node0$i -c confs/proxysql0$i.cfg 2> /dev/null
 	echo "Done!"
diff --git a/test/cluster/start.sh b/test/cluster/start.sh
index b8d318b18..4370d0cf8 100755
--- a/test/cluster/start.sh
+++ b/test/cluster/start.sh
@@ -1,4 +1,5 @@
-#/bin/bash
+#!/usr/bin/env bash
+
 echo "Starting the core nodes"
 ../../src/proxysql -D $PWD/node01 -c confs/proxysql01.cfg
 ../../src/proxysql -D $PWD/node02 -c confs/proxysql02.cfg
diff --git a/test/cluster/stop.sh b/test/cluster/stop.sh
index a8f10fcce..d24389b0f 100755
--- a/test/cluster/stop.sh
+++ b/test/cluster/stop.sh
@@ -1,5 +1,6 @@
-#/bin/bash
+#!/usr/bin/env bash
+
 echo "Stopping all nodes"
 for i in `seq 1 9` ; do
-	mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "PROXYSQL SHUTDOWN SLOW"
+	mysql -u admin -padmin -h 127.0.0.1 -P2600$i -e "PROXYSQL SHUTDOWN SLOW" 2>&1 | grep -v "Using a password"
 done