diff --git a/run_tests.sh b/run_tests.sh
index 680f79e..2a558b5 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -23,7 +23,7 @@
   esac
 }
 
-noseargs="tempest"
+noseargs=""
 just_pep8=0
 
 export NOSE_WITH_OPENSTACK=1
@@ -37,6 +37,15 @@
   process_option $arg
 done
 
+
+# only add tempest default if we don't specify a test
+if [[ "x$noseargs" =~ "tempest" ]]; then
+  noseargs="$noseargs"
+else
+  noseargs="$noseargs tempest"
+fi
+
+
 function run_tests {
   $NOSETESTS
 }