diff --git a/openstack/tools/charmed_openstack_functest_runner.sh b/openstack/tools/charmed_openstack_functest_runner.sh
index 6ba2c7b2..ea0715f3 100755
--- a/openstack/tools/charmed_openstack_functest_runner.sh
+++ b/openstack/tools/charmed_openstack_functest_runner.sh
@@ -46,6 +46,9 @@ EOF
 while (($# > 0))
 do
     case "$1" in
+        --debug)
+           set -x
+           ;;
         --func-test-target)
            FUNC_TEST_TARGET=$2
            shift
@@ -73,8 +76,6 @@ do
     shift
 done
 
-set -x
-
 source ~/novarc
 export {,TEST_}CIDR_EXT=`openstack subnet show subnet_${OS_USERNAME}-psd-extra -c cidr -f value`
 FIP_MAX=$(ipcalc $CIDR_EXT| awk '$1=="HostMax:" {print $2}')