diff --git a/src/tests/kits/storage/TestApp.cpp b/src/tests/kits/storage/TestApp.cpp
index bb3e982f8e..90d2ba6bc3 100644
--- a/src/tests/kits/storage/TestApp.cpp
+++ b/src/tests/kits/storage/TestApp.cpp
@@ -1,5 +1,8 @@
 // TestApp.cpp
 
+#include <stdio.h>
+#include <string.h>
+
 #include <Autolock.h>
 
 #include <TestApp.h>
@@ -27,12 +30,20 @@ BTestHandler::Queue()
 
 // TestApp
 
+static status_t sInitError;
+
 // constructor
 BTestApp::BTestApp(const char *signature)
-	   : BApplication(signature),
+	   : BApplication(signature, &sInitError),
 		 fAppThread(B_ERROR),
 		 fHandlers()
 {
+	if (sInitError != B_OK) {
+		fprintf(stderr, "BTestApp::BTestApp(): Failed to create BApplication: "
+			"%s\n", strerror(sInitError));
+		exit(1);
+	}
+
 	CreateTestHandler();
 	Unlock();
 }
diff --git a/src/tools/cppunit/TestApp.cpp b/src/tools/cppunit/TestApp.cpp
index 1e5b9d4f61..291813e660 100644
--- a/src/tools/cppunit/TestApp.cpp
+++ b/src/tools/cppunit/TestApp.cpp
@@ -1,5 +1,8 @@
 // TestApp.cpp
 
+#include <stdio.h>
+#include <string.h>
+
 #include <Autolock.h>
 
 #include <TestApp.h>
@@ -29,13 +32,21 @@ BTestHandler::Queue()
 
 // TestApp
 
+static status_t sInitError;
+
 // constructor
 _EXPORT
 BTestApp::BTestApp(const char *signature)
-	   : BApplication(signature),
+	   : BApplication(signature, &sInitError),
 		 fAppThread(B_ERROR),
 		 fHandlers()
 {
+	if (sInitError != B_OK) {
+		fprintf(stderr, "BTestApp::BTestApp(): Failed to create BApplication: "
+			"%s\n", strerror(sInitError));
+		exit(1);
+	}
+
 	CreateTestHandler();
 	Unlock();
 }