diff --git a/test/include/run_tests b/test/include/run_tests
index 4bca8ec3bf..430a1bb441 100755
--- a/test/include/run_tests
+++ b/test/include/run_tests
@@ -6,7 +6,7 @@
 # Arguements
 # ==========
 # 
-# test_list  =  no args runs all tests
+# test_list  =  no args or "all" runs all tests
 #              or
 #               atomic runs atomic tests
 
@@ -22,13 +22,29 @@ umask 007
 
 if ("x$1" == "x") then
   ./atomic
-else if ("$1" == "atomic") then
-  ./atomic
-else
-  echo "correct use: "
-  echo "    run_tests (to run all include tests)"
-  echo "or  run_tests <atomic>"
-  exit -1
+else 
+  foreach target ($argv)
+    switch ($target)
+    case "all":
+      ./atomic
+      breaksw
+    case "atomic"
+      ./$target
+      breaksw
+    case "help"
+      echo "correct use: "
+      echo "    run_tests help (this message)"
+      echo "    run_tests all (to run all include tests)"
+      echo "or  run_tests <atomic>"
+      break
+    default
+      echo "There is no program <$target> to run"
+      echo "correct use: "
+      echo "    run_tests help (this message)"
+      echo "    run_tests all (to run all include tests)"
+      echo "or  run_tests <atomic>"
+      break
+    endsw
+  end
+
 endif
-
-