diff --git a/src/tests/kits/app/bapplication/AppRunner.cpp b/src/tests/kits/app/common/AppRunner.cpp
similarity index 96%
rename from src/tests/kits/app/bapplication/AppRunner.cpp
rename to src/tests/kits/app/common/AppRunner.cpp
index e539120944..6fdacc56f4 100644
--- a/src/tests/kits/app/bapplication/AppRunner.cpp
+++ b/src/tests/kits/app/common/AppRunner.cpp
@@ -16,19 +16,22 @@
 static const char *kAppRunnerTeamPort = "app runner team port";
 
 // constructor
-AppRunner::AppRunner()
+AppRunner::AppRunner(bool requestQuitOnDestruction)
 		 : fOutputLock(),
 		   fRemotePort(-1),
 		   fOutput(),
 		   fReader(-1),
 		   fTeam(-1),
-		   fMessenger()
+		   fMessenger(),
+		   fRequestQuitOnDestruction(requestQuitOnDestruction)
 {
 }
 
 // destructor
 AppRunner::~AppRunner()
 {
+	if (fRequestQuitOnDestruction)
+		WaitFor(true);
 	if (fReader >= 0) {
 		int32 result;
 		wait_for_thread(fReader, &result);
diff --git a/src/tests/kits/app/bapplication/AppRunner.h b/src/tests/kits/app/common/AppRunner.h
similarity index 91%
rename from src/tests/kits/app/bapplication/AppRunner.h
rename to src/tests/kits/app/common/AppRunner.h
index 4950d2450d..382e56db5b 100644
--- a/src/tests/kits/app/bapplication/AppRunner.h
+++ b/src/tests/kits/app/common/AppRunner.h
@@ -10,7 +10,7 @@
 
 class AppRunner {
 public:
-	AppRunner();
+	AppRunner(bool requestQuitOnDestruction = false);
 	~AppRunner();
 
 	status_t Run(const char *command, const char *args = NULL,
@@ -39,6 +39,7 @@ private:
 	thread_id	fReader;
 	team_id		fTeam;
 	BMessenger	fMessenger;
+	bool		fRequestQuitOnDestruction;
 
 	static port_id	fTeamPort;
 	static BLocker	fTeamPortLock;
diff --git a/src/tests/kits/app/bapplication/testapps/CommonTestApp.cpp b/src/tests/kits/app/common/CommonTestApp.cpp
similarity index 100%
rename from src/tests/kits/app/bapplication/testapps/CommonTestApp.cpp
rename to src/tests/kits/app/common/CommonTestApp.cpp
diff --git a/src/tests/kits/app/bapplication/testapps/CommonTestApp.h b/src/tests/kits/app/common/CommonTestApp.h
similarity index 100%
rename from src/tests/kits/app/bapplication/testapps/CommonTestApp.h
rename to src/tests/kits/app/common/CommonTestApp.h
diff --git a/src/tests/kits/app/common/Jamfile b/src/tests/kits/app/common/Jamfile
new file mode 100644
index 0000000000..37ad6f834b
--- /dev/null
+++ b/src/tests/kits/app/common/Jamfile
@@ -0,0 +1,5 @@
+SubDir OBOS_TOP src tests kits app common ;
+
+TestObjects CommonTestApp.cpp : app support ;
+TestObjects CommonTestApp.cpp : : true ;
+
diff --git a/src/tests/kits/app/bapplication/PipedAppRunner.cpp b/src/tests/kits/app/common/PipedAppRunner.cpp
similarity index 100%
rename from src/tests/kits/app/bapplication/PipedAppRunner.cpp
rename to src/tests/kits/app/common/PipedAppRunner.cpp
diff --git a/src/tests/kits/app/bapplication/PipedAppRunner.h b/src/tests/kits/app/common/PipedAppRunner.h
similarity index 100%
rename from src/tests/kits/app/bapplication/PipedAppRunner.h
rename to src/tests/kits/app/common/PipedAppRunner.h