diff --git a/build/jam/HelperRules b/build/jam/HelperRules
index 3a66b1a16b..53aa2426ce 100644
--- a/build/jam/HelperRules
+++ b/build/jam/HelperRules
@@ -142,7 +142,7 @@ rule SetPlatformCompatibilityFlagVariables
 
 	# special case: Haiku libbe.so built for testing under BeOS
 	if $(platform) = libbe_test {
-		platform = haiku ;
+		platform = $(HOST_PLATFORM) ;
 	}
 
 	$(varPrefix)_PLATFORM_BEOS_COMPATIBLE = ;
diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile
index 8efc05c2b3..038ea1d52c 100644
--- a/src/kits/tracker/Jamfile
+++ b/src/kits/tracker/Jamfile
@@ -18,7 +18,7 @@ SubDirC++Flags
 	;
 
 local vector_icon_libs ;
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM) != libbe_test {
 	vector_icon_libs = libicon.a libagg.a ;
 }