diff --git a/TestScripts/governor.sh b/TestScripts/governor.sh
index 70cf5c75..6cc9e67d 100755
--- a/TestScripts/governor.sh
+++ b/TestScripts/governor.sh
@@ -4,22 +4,22 @@
 # accurate benchmark results. To move from a low energy state to a higher
 # one, run 'governor.sh performance'. To move back to a low power state
 # run 'governor.sh powersave' or 'governor.sh ondemand' or reboot. The script
-# is based on code by Andy Polyakov, http://www.openssl.org/~appro/cryptogams/.
+# based on code by Andy Polyakov, http://www.openssl.org/~appro/cryptogams/.
 
 # Fixup ancient Bash
 # https://unix.stackexchange.com/q/468579/56041
-if [[ -z "$BASH_SOURCE" ]]; then
+if [[ -z "${BASH_SOURCE[0]}" ]]; then
 	BASH_SOURCE="$0"
 fi
 
 if [[ "$EUID" -ne 0 ]]; then
     echo "This script must be run as root"
-    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+    [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
 fi
 
 if [ "x$1" = "x" ]; then
     echo "usage: $0 on[demand]|pe[rformance]|po[wersave]|us[erspace]?"
-    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+    [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
 fi
 
 # "on demand" may result in a "invalid write argument" or similar
@@ -34,34 +34,34 @@ case $1 in
 esac
 
 if [ -z "$governor" ]; then
-	[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+	[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
 fi
 
 cpus=$(ls /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor 2>/dev/null)
 
 if [ -z "$cpus" ]; then
 	echo "Failed to read CPU system device tree"
-	[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+	[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
 fi
 
 echo "Current CPU governor scaling settings:"
 count=0
 for cpu in $cpus; do
-	echo "  CPU $count:" $(cat "$cpu")
+	echo "  CPU $count: $(cat "$cpu")"
 	((count++))
 done
 
 if [ "x$governor" != "x" ]; then
     for cpu in $cpus; do
-        echo $governor > $cpu
+        echo "$governor" > "$cpu"
     done
 fi
 
 echo "New CPU governor scaling settings:"
 count=0
 for cpu in $cpus; do
-	echo "  CPU $count:" $(cat "$cpu")
+	echo "  CPU $count: $(cat "$cpu")"
 	((count++))
 done
 
-[[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0
+[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 0 || return 0