diff --git a/src/tests/kits/app/AppKitTestAddon.cpp b/src/tests/kits/app/AppKitTestAddon.cpp
index 97e7a2a257..2db430ad06 100644
--- a/src/tests/kits/app/AppKitTestAddon.cpp
+++ b/src/tests/kits/app/AppKitTestAddon.cpp
@@ -15,7 +15,7 @@
 #include "broster/RosterTest.h"
 #include "RegistrarThreadManagerTest.h"
 
-BTestSuite* getTestSuite() {
+BTestSuite* getTestSuite2() {
 	BTestSuite *suite = new BTestSuite("App");
 
 	// ##### Add test suites here #####
diff --git a/src/tests/kits/app/AppKitTestStub.cpp b/src/tests/kits/app/AppKitTestStub.cpp
new file mode 100644
index 0000000000..e0213a1078
--- /dev/null
+++ b/src/tests/kits/app/AppKitTestStub.cpp
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+//	AppKitTestStub.cpp
+//
+//------------------------------------------------------------------------------
+
+// Standard Includes -----------------------------------------------------------
+
+// System Includes -------------------------------------------------------------
+
+// Project Includes ------------------------------------------------------------
+#include <TestSuite.h>
+#include <TestSuiteAddon.h>
+
+// Local Includes --------------------------------------------------------------
+
+// Local Defines ---------------------------------------------------------------
+
+// Globals ---------------------------------------------------------------------
+
+
+extern BTestSuite* getTestSuite2();
+
+BTestSuite* getTestSuite() {
+	return getTestSuite2();
+}
+
+/*
+ * $Log $
+ *
+ * $Id  $
+ *
+ */
+
diff --git a/src/tests/kits/app/Jamfile b/src/tests/kits/app/Jamfile
index 6a77bf4a87..eb55c0bbf4 100644
--- a/src/tests/kits/app/Jamfile
+++ b/src/tests/kits/app/Jamfile
@@ -142,6 +142,14 @@ CommonTestLib libapptest.so
 	: app support
 ;
 
+CommonTestLib libappteststub.so
+	: AppKitTestStub.cpp
+	: libapptest.so stdc++.r4
+	: libapptest_r5.so stdc++.r4
+	:
+	:
+;
+
 SubInclude OBOS_TOP src tests kits app bapplication ;
 SubInclude OBOS_TOP src tests kits app bclipboard ;
 SubInclude OBOS_TOP src tests kits app bcursor ;