diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile
index 05107715ca..87b4ec400b 100644
--- a/src/apps/deskbar/Jamfile
+++ b/src/apps/deskbar/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src apps deskbar ;
 
+AddSubDirSupportedPlatforms libbe_test ;
+
 UsePrivateHeaders app ;
 UsePrivateHeaders shared ;
 UsePrivateHeaders tracker ;
@@ -33,19 +35,10 @@ Application Deskbar :
 	WindowMenuItem.cpp
 	ResourceSet.cpp
 	Switcher.cpp
+	: be tracker
 	;
 
-if $(TARGET_PLATFORM) = haiku {
-	# link for Haiku
-
-	LinkAgainst Deskbar :
-		libbe.so libtracker.so
-	;
-
-} else {
-	# link against build platform libs
-
-	LinkAgainst Deskbar :
-		be tracker
-	;
+if $(TARGET_PLATFORM) = libbe_test {
+	HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Deskbar
+		: tests!apps ;
 }
diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp
index 6b3249e103..332f1b5b28 100644
--- a/src/apps/deskbar/StatusView.cpp
+++ b/src/apps/deskbar/StatusView.cpp
@@ -144,7 +144,7 @@ TReplicantTray::AttachedToWindow()
 
 #ifdef DB_ADDONS		
 	//	load addons and rehydrate archives		
-#if !__HAIKU__
+#if !defined(__HAIKU__) && !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
 	InitAddOnSupport();	
 #endif
 #endif