diff --git a/headers/tools/cppunit/TestApp.h b/headers/tools/cppunit/TestApp.h
index 98fb8ca15f..fb136235fd 100644
--- a/headers/tools/cppunit/TestApp.h
+++ b/headers/tools/cppunit/TestApp.h
@@ -8,7 +8,7 @@
 
 // TestHandler
 
-class TestHandler : public BHandler {
+class BTestHandler : public BHandler {
 public:
 	virtual void MessageReceived(BMessage *message);
 	BMessageQueue &Queue();
@@ -20,23 +20,23 @@ private:
 
 // TestApp
 
-class TestApp : public BApplication {
+class BTestApp : public BApplication {
 public:
-	TestApp(const char *signature);
+	BTestApp(const char *signature);
 
 	status_t Init();
 	void Terminate();
 
 	virtual void ReadyToRun();
 
-	TestHandler &Handler();
+	BTestHandler &Handler();
 
 private:
 	static int32 _AppThreadStart(void *data);
 
 private:
 	thread_id		fAppThread;
-	TestHandler	fHandler;
+	BTestHandler	fHandler;
 };
 
 #endif	// _beos_test_app_h_
diff --git a/src/tests/kits/storage/Jamfile b/src/tests/kits/storage/Jamfile
index 48cac28b13..d6332a358a 100644
--- a/src/tests/kits/storage/Jamfile
+++ b/src/tests/kits/storage/Jamfile
@@ -1,5 +1,6 @@
 SubDir OBOS_TOP src tests kits storage ;
 
+UsePrivateHeaders storage ;
 
 CommonTestLib libstoragetest.so
 	: StorageKitTestAddon.cpp
diff --git a/src/tests/kits/storage/QueryTest.cpp b/src/tests/kits/storage/QueryTest.cpp
index 3e24215359..fd6bdcd9a8 100644
--- a/src/tests/kits/storage/QueryTest.cpp
+++ b/src/tests/kits/storage/QueryTest.cpp
@@ -543,7 +543,7 @@ void
 QueryTest::setUp()
 {
 	BasicTest::setUp();
-	fApplication = new TestApp("application/x-vnd.obos.query-test");
+	fApplication = new BTestApp("application/x-vnd.obos.query-test");
 	if (fApplication->Init() != B_OK) {
 		fprintf(stderr, "Failed to initialize application.\n");
 		delete fApplication;
diff --git a/src/tests/kits/storage/QueryTest.h b/src/tests/kits/storage/QueryTest.h
index c81b9c4e47..a761963197 100644
--- a/src/tests/kits/storage/QueryTest.h
+++ b/src/tests/kits/storage/QueryTest.h
@@ -12,7 +12,7 @@
 #include "BasicTest.h"
 
 class QueryTestEntry;
-class TestApp;
+class BTestApp;
 
 class QueryTest : public BasicTest
 {
@@ -41,7 +41,7 @@ public:
 	void LiveTest();
 
 private:
-	TestApp		*fApplication;
+	BTestApp	*fApplication;
 	bool		fVolumeCreated;
 };
 
diff --git a/src/tools/cppunit/TestApp.cpp b/src/tools/cppunit/TestApp.cpp
index ae58eff75c..b9757ba6fc 100644
--- a/src/tools/cppunit/TestApp.cpp
+++ b/src/tools/cppunit/TestApp.cpp
@@ -6,7 +6,7 @@
 
 // MessageReceived
 void
-TestHandler::MessageReceived(BMessage *message)
+BTestHandler::MessageReceived(BMessage *message)
 {
 	// clone and push it
 	BMessage *clone = new BMessage(*message);
@@ -17,7 +17,7 @@ TestHandler::MessageReceived(BMessage *message)
 
 // Queue
 BMessageQueue &
-TestHandler::Queue()
+BTestHandler::Queue()
 {
 	return fQueue;
 }
@@ -26,7 +26,7 @@ TestHandler::Queue()
 // TestApp
 
 // constructor
-TestApp::TestApp(const char *signature)
+BTestApp::BTestApp(const char *signature)
 	   : BApplication(signature),
 		 fAppThread(B_ERROR),
 		 fHandler()
@@ -37,7 +37,7 @@ TestApp::TestApp(const char *signature)
 
 // Init
 status_t
-TestApp::Init()
+BTestApp::Init()
 {
 	status_t error = B_OK;
 	fAppThread = spawn_thread(&_AppThreadStart, "query app",
@@ -56,7 +56,7 @@ TestApp::Init()
 
 // Terminate
 void
-TestApp::Terminate()
+BTestApp::Terminate()
 {
 	PostMessage(B_QUIT_REQUESTED, this);
 	int32 result;
@@ -65,22 +65,22 @@ TestApp::Terminate()
 
 // ReadyToRun
 void
-TestApp::ReadyToRun()
+BTestApp::ReadyToRun()
 {
 }
 
 // Handler
-TestHandler &
-TestApp::Handler()
+BTestHandler &
+BTestApp::Handler()
 {
 	return fHandler;
 }
 
 // _AppThreadStart
 int32
-TestApp::_AppThreadStart(void *data)
+BTestApp::_AppThreadStart(void *data)
 {
-	if (TestApp *app = (TestApp*)data) {
+	if (BTestApp *app = (BTestApp*)data) {
 		app->Lock();
 		app->Run();
 	}