diff --git a/src/tests/kits/app/Jamfile b/src/tests/kits/app/Jamfile
index 0faff4e465..4b73d34f79 100644
--- a/src/tests/kits/app/Jamfile
+++ b/src/tests/kits/app/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src tests kits app ;
 
 SubInclude OBOS_TOP src tests kits app bhandler ;
-#SubInclude OBOS_TOP src tests kits app blooper ;
+SubInclude OBOS_TOP src tests kits app blooper ;
 #SubInclude OBOS_TOP src tests kits app bmessageQueue ;
 SubInclude OBOS_TOP src tests kits app bmessenger ;
diff --git a/src/tests/kits/app/bhandler/IsWatchedTest.cpp b/src/tests/kits/app/bhandler/IsWatchedTest.cpp
index 5068f261ad..e4809bc4a0 100644
--- a/src/tests/kits/app/bhandler/IsWatchedTest.cpp
+++ b/src/tests/kits/app/bhandler/IsWatchedTest.cpp
@@ -42,7 +42,9 @@ void TIsWatchedTest::IsWatched2()
 	assert(fHandler.IsWatched() == true);
 
 	fHandler.StopWatching(&Watcher, '1234');
+#ifndef TEST_R5
 	assert(fHandler.IsWatched() == false);
+#endif
 }
 //------------------------------------------------------------------------------
 Test* TIsWatchedTest::Suite()
diff --git a/src/tests/kits/app/blooper/IsMessageWaitingTest.cpp b/src/tests/kits/app/blooper/IsMessageWaitingTest.cpp
index a98727a2c8..a47b91e748 100644
--- a/src/tests/kits/app/blooper/IsMessageWaitingTest.cpp
+++ b/src/tests/kits/app/blooper/IsMessageWaitingTest.cpp
@@ -6,13 +6,8 @@
 // Standard Includes -----------------------------------------------------------
 
 // System Includes -------------------------------------------------------------
-#if defined(SYSTEM_TEST)
-#include <be/app/Looper.h>
-#include <be/app/MessageQueue.h>
-#else
-#include "../../../../lib/application/headers/Looper.h"
-#include "../../../../lib/application/headers/MessageQueue.h"
-#endif
+#include <Looper.h>
+#include <MessageQueue.h>
 
 // Project Includes ------------------------------------------------------------
 
diff --git a/src/tests/kits/app/blooper/IsMessageWaitingTest.h b/src/tests/kits/app/blooper/IsMessageWaitingTest.h
index ea04222588..4a933cce71 100644
--- a/src/tests/kits/app/blooper/IsMessageWaitingTest.h
+++ b/src/tests/kits/app/blooper/IsMessageWaitingTest.h
@@ -13,7 +13,7 @@
 // Project Includes ------------------------------------------------------------
 
 // Local Includes --------------------------------------------------------------
-#include "common.h"
+#include "../common.h"
 
 // Local Defines ---------------------------------------------------------------
 
@@ -22,6 +22,7 @@
 class TIsMessageWaitingTest : public TestCase
 {
 	public:
+		TIsMessageWaitingTest() {;}
 		TIsMessageWaitingTest(std::string name) : TestCase(name) {;}
 
 		void IsMessageWaiting1();
diff --git a/src/tests/kits/app/blooper/Jamfile b/src/tests/kits/app/blooper/Jamfile
index 712acb8f81..9d3eb504d2 100644
--- a/src/tests/kits/app/blooper/Jamfile
+++ b/src/tests/kits/app/blooper/Jamfile
@@ -1,13 +1,11 @@
 SubDir OBOS_TOP src tests kits app blooper ;
 
-UsePublicHeaders app support ;
-
-UnitTest BLooperTester : main.cpp
-		IsMessageWaitingTest.cpp
-		RemoveHandlerTest.cpp
-	: kits/app ;
-
-LinkSharedOSLibs BLooperTester :
-	libopenbeos.so
-	be
-	stdc++.r4 ;
+CommonUnitTest BLooperTester
+	: main.cpp
+	  IsMessageWaitingTest.cpp
+	  RemoveHandlerTest.cpp
+	: kits app
+	: libopenbeos.so be stdc++.r4
+	: be stdc++.r4
+	: app support
+;
diff --git a/src/tests/kits/app/blooper/RemoveHandlerTest.cpp b/src/tests/kits/app/blooper/RemoveHandlerTest.cpp
index 24feeaa5ba..cc92e8c1aa 100644
--- a/src/tests/kits/app/blooper/RemoveHandlerTest.cpp
+++ b/src/tests/kits/app/blooper/RemoveHandlerTest.cpp
@@ -6,15 +6,9 @@
 // Standard Includes -----------------------------------------------------------
 
 // System Includes -------------------------------------------------------------
-#if defined(SYSTEM_TEST)
-#include <be/app/Handler.h>
-#include <be/app/Looper.h>
-#include <be/app/MessageFilter.h>
-#else
-#include "../../../../lib/application/headers/Handler.h"
-#include "../../../../lib/application/headers/Looper.h"
-#include "../../../../lib/application/headers/MessageFilter.h"
-#endif
+#include <Handler.h>
+#include <Looper.h>
+#include <MessageFilter.h>
 
 // Project Includes ------------------------------------------------------------
 
diff --git a/src/tests/kits/app/blooper/RemoveHandlerTest.h b/src/tests/kits/app/blooper/RemoveHandlerTest.h
index 7137b4df6c..9f66d80029 100644
--- a/src/tests/kits/app/blooper/RemoveHandlerTest.h
+++ b/src/tests/kits/app/blooper/RemoveHandlerTest.h
@@ -13,7 +13,7 @@
 // Project Includes ------------------------------------------------------------
 
 // Local Includes --------------------------------------------------------------
-#include "common.h"
+#include "../common.h"
 
 // Local Defines ---------------------------------------------------------------
 
@@ -22,6 +22,7 @@
 class TRemoveHandlerTest : public TestCase
 {
 	public:
+		TRemoveHandlerTest() {;}
 		TRemoveHandlerTest(std::string name) : TestCase(name) {;}
 
 		void RemoveHandler1();