diff --git a/tests/includes/verbose.sh b/tests/includes/verbose.sh
index d2f0b788b8b..c89394a38cd 100644
--- a/tests/includes/verbose.sh
+++ b/tests/includes/verbose.sh
@@ -11,6 +11,11 @@ set_verbosity() {
 		set -eu
 		set -o pipefail
 		;;
+	11)
+		# You asked for it!
+		set -eux
+		set -o pipefail
+		;;
 	*)
 		echo "Unexpected verbose level" >&2
 		exit 1
diff --git a/tests/main.sh b/tests/main.sh
index fd06cfc730c..5e17b24f427 100755
--- a/tests/main.sh
+++ b/tests/main.sh
@@ -115,6 +115,7 @@ show_help() {
 	echo ""
 	echo "    $(green './main.sh -h')        Display this help message"
 	echo "    $(green './main.sh -v')        Verbose and debug messages"
+	echo "    $(green './main.sh -V')        Verbose and debug messages with all commands printed"
 	echo "    $(green './main.sh -A')        Run all the test suites"
 	echo "    $(green './main.sh -s')        Skip tests using a comma seperated list"
 	echo "    $(green './main.sh -a')        Create an artifact file"
@@ -161,7 +162,7 @@ show_help() {
 	exit 1
 }
 
-while getopts "hH?vAs:a:x:rl:p:c:R:S:" opt; do
+while getopts "hH?vAs:a:x:rl:p:c:R:S:V" opt; do
 	case "${opt}" in
 	h | \?)
 		show_help
@@ -174,6 +175,11 @@ while getopts "hH?vAs:a:x:rl:p:c:R:S:" opt; do
 		# shellcheck disable=SC2262
 		alias juju="juju --debug"
 		;;
+	V)
+		VERBOSE=11
+		# shellcheck disable=SC2262
+		alias juju="juju --debug"
+		;;
 	A)
 		RUN_ALL="true"
 		;;