diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 9abdedbba8..600cacd5c8 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -25,8 +25,13 @@ else
 	clean=true
 fi
 
-while getopts "knp:r" flag; do
+while getopts "knp:r-:" flag; do
     case "$flag" in
+	-) case "${OPTARG}" in
+               keep) stopservers=false ;;
+               noclean) clean=false ;;
+           esac
+           ;;
 	k) stopservers=false ;;
 	n) clean=false ;;
 	p) baseport=$OPTARG ;;