diff --git a/src/tests/servers/app/workspace_switcher/workspace_switcher.cpp b/src/tests/servers/app/workspace_switcher/workspace_switcher.cpp
index 455d7bb5b8..5d048236c7 100644
--- a/src/tests/servers/app/workspace_switcher/workspace_switcher.cpp
+++ b/src/tests/servers/app/workspace_switcher/workspace_switcher.cpp
@@ -7,18 +7,31 @@
  */
 
 
+#include <stdlib.h>
+
 #include <Application.h>
 
 
 int
-main()
+main(int argc, char** argv)
 {
 	BApplication app("application/x-vnd.Haiku-test-wss");
 
-	while (true) {
-		activate_workspace(0);
-		snooze(3000);
-		activate_workspace(1);
+	if (argc == 1) {
+		// switch forever
+		while (true) {
+			activate_workspace(0);
+			snooze(3000);
+			activate_workspace(1);
+		}
+		return 0;
 	}
+
+	for (int i = 1; i < argc; i++) {
+		activate_workspace(strtoul(argv[i], NULL, 0));
+		snooze(3000);
+	}
+
+	return 0;
 }