diff --git a/src/tests/kits/app/Jamfile b/src/tests/kits/app/Jamfile
index cfe9728a65..e8a51b367c 100644
--- a/src/tests/kits/app/Jamfile
+++ b/src/tests/kits/app/Jamfile
@@ -33,4 +33,4 @@ CommonTestLib libapptest.so
 SubInclude OBOS_TOP src tests kits app bhandler ;
 SubInclude OBOS_TOP src tests kits app blooper ;
 #SubInclude OBOS_TOP src tests kits app bmessageQueue ;
-#SubInclude OBOS_TOP src tests kits app bmessenger ;
+SubInclude OBOS_TOP src tests kits app bmessenger ;
diff --git a/src/tests/kits/app/bmessenger/Jamfile b/src/tests/kits/app/bmessenger/Jamfile
index a739df0e79..1fff8484b0 100644
--- a/src/tests/kits/app/bmessenger/Jamfile
+++ b/src/tests/kits/app/bmessenger/Jamfile
@@ -1,10 +1,8 @@
 SubDir OBOS_TOP src tests kits app bmessenger ;
 
-CommonUnitTest BMessengerTester
-	: main.cpp
-	  LockTargetTester.cpp
-	  BMessengerTester.cpp
-	  TargetTester.cpp
+CommonUnitTest SMRemoteTargetApp
+	: SMRemoteTargetApp.cpp
+	  SMLooper.cpp
 	: kits app
 	: <boot!home!config!lib>libopenbeos.so be stdc++.r4
 	: be stdc++.r4