diff --git a/launcher.sh b/launcher.sh
index cf46eef03b7449978fe5445110759e7fbe2c12f1..4970e9be5c15a0240a0338645907b4b17ac74773 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -94,20 +94,20 @@ case "$1" in
 		monitor
 		campusmanager
 		mediaserver
-		tests
+		[[ $2 = "--skip-tests" ]] || tests
 	;;
 
 	"w")
 		init
 		worker
-		tests
+		[[ $2 = "--skip-tests" ]] || tests
 	;;
 
 	"cm")
 		init
 		monitor
 		campusmanager
-		tests
+		[[ $2 = "--skip-tests" ]] || tests
 	;;
 
 	"cache")
@@ -132,7 +132,7 @@ case "$1" in
 
 	*)
 		echo "
-Usage: $0 [arg]
+Usage: $0 [arg] [--skip-tests]
 ms          build a MediaServer & CM
 w           build a Worker
 cm          build a Campus-Manager