diff --git a/bin/check.sh b/bin/check.sh
index 759f236a..2a9b8c1b 100755
--- a/bin/check.sh
+++ b/bin/check.sh
@@ -148,7 +148,7 @@ function usage
   echo -e "\t-R: skip run sipp"
   echo -e "\t-D: skip deletion of domain and subscribers as final step"
   echo -e "\t-T: skip checks"
-  echo -e "\t-G: skip creation of graphviz image"
+  echo -e "\t-G: creation of graphviz image"
   echo -e "\t-d: DOMAIN"
   echo -e "\t-p CE|PRO default is CE"
   echo "Arguments:"
@@ -164,7 +164,7 @@ while getopts 'hCRDTGd:p:' opt; do
     R) SKIP_RUNSIPP=1;;
     D) SKIP_DELDOMAIN=1;;
     T) SKIP_TESTS=1;;
-    G) SKIP_GRAPH=1;;
+    G) GRAPH=1;;
   esac
 done
 shift $(($OPTIND - 1))
@@ -223,7 +223,7 @@ if [ -z ${SKIP_TESTS} ]; then
     msg=${LOG_DIR}/$(basename $msg_name)
     dest=${RESULT_DIR}/$(basename $t .yml)
     check_test $t $msg ${dest}.tap
-    if [ -z ${SKIP_GRAPH} ]; then
+    if [ ! -z ${GRAPH} ]; then
       echo "Generating flow image: ${dest}.png"
       graph $msg ${dest}.png
     fi
diff --git a/run_tests.sh b/run_tests.sh
index 2814c526..d755edd9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -13,6 +13,7 @@ function usage
   echo "-p CE|PRO default is CE"
   echo "-c skips configuration of the environment"
   echo "-t skips tests"
+  echo "-g generate route flow graphs"
   echo "-h this help"
 }
 
@@ -22,6 +23,7 @@ while getopts 'hctp:' opt; do
     c) SKIP=1;;
     t) TEST=1;;
     p) PROFILE=$OPTARG;;
+    g) GRAPH="-G"
   esac
 done
 shift $(($OPTIND - 1))
@@ -50,7 +52,7 @@ done
 for t in $(find ${BASE_DIR}/scenarios/ -depth -maxdepth 1 -mindepth 1 -type d | sort); do
   echo "Run: $(basename $t)"
   if [ -z $TEST ]; then
-    ${BIN_DIR}/check.sh -d ${DOMAIN} -p ${PROFILE} $(basename $t)
+    ${BIN_DIR}/check.sh ${GRAPH} -d ${DOMAIN} -p ${PROFILE} $(basename $t)
     if [ $? -ne 0 ]; then
     	error_flag=1
     fi