diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 5290b17970..5d80378b74 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -182,3 +182,4 @@ SubInclude HAIKU_TOP src tests servers app stress_test ;
 SubInclude HAIKU_TOP src tests servers app textview ;
 SubInclude HAIKU_TOP src tests servers app view_state ;
 SubInclude HAIKU_TOP src tests servers app window_creation ;
+SubInclude HAIKU_TOP src tests servers app workspace_switcher ;
diff --git a/src/tests/servers/app/workspace_switcher/Jamfile b/src/tests/servers/app/workspace_switcher/Jamfile
new file mode 100644
index 0000000000..8e12f117b2
--- /dev/null
+++ b/src/tests/servers/app/workspace_switcher/Jamfile
@@ -0,0 +1,18 @@
+SubDir HAIKU_TOP src tests servers app workspace_switcher ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
+UseHeaders [ FDirName os app ] ;
+UseHeaders [ FDirName os interface ] ;
+
+Application workspace_switcher :
+	workspace_switcher.cpp
+	: be
+;
+
+if $(TARGET_PLATFORM) = libbe_test {
+	HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : workspace_switcher
+		: tests!apps ;
+}
+
diff --git a/src/tests/servers/app/workspace_switcher/workspace_switcher.cpp b/src/tests/servers/app/workspace_switcher/workspace_switcher.cpp
new file mode 100644
index 0000000000..455d7bb5b8
--- /dev/null
+++ b/src/tests/servers/app/workspace_switcher/workspace_switcher.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008, Haiku Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Axel Dörfler, axeld@pinc-software.de
+ */
+
+
+#include <Application.h>
+
+
+int
+main()
+{
+	BApplication app("application/x-vnd.Haiku-test-wss");
+
+	while (true) {
+		activate_workspace(0);
+		snooze(3000);
+		activate_workspace(1);
+	}
+}
+