diff --git a/src/tests/kits/app/common/AppRunner.cpp b/src/tests/kits/app/common/AppRunner.cpp
index 0d5df5053b..f3681d45bb 100644
--- a/src/tests/kits/app/common/AppRunner.cpp
+++ b/src/tests/kits/app/common/AppRunner.cpp
@@ -288,7 +288,7 @@ find_test_app(const char *testApp, BString *path)
 	if (error == B_OK) {
 		*path = BTestShell::GlobalTestDir();
 		path->CharacterEscape(" \t\n!\"'`$&()?*+{}[]<>|", '\\');
-		*path += "/../kits/app/";
+		*path += "/";
 		*path += testApp;
 		#ifdef TEST_R5
 			*path += "_r5";
diff --git a/src/tests/kits/app/common/CommonTestApp.cpp b/src/tests/kits/app/common/CommonTestApp.cpp
index c881a09b84..7a7794a1bf 100644
--- a/src/tests/kits/app/common/CommonTestApp.cpp
+++ b/src/tests/kits/app/common/CommonTestApp.cpp
@@ -1,6 +1,7 @@
 // CommonTestApp.cpp
 
 #include <stdio.h>
+#include <cstring>
 
 #include <OS.h>
 
diff --git a/src/tests/kits/app/common/PipedAppRunner.cpp b/src/tests/kits/app/common/PipedAppRunner.cpp
index 2d8d30572f..8d127c0670 100644
--- a/src/tests/kits/app/common/PipedAppRunner.cpp
+++ b/src/tests/kits/app/common/PipedAppRunner.cpp
@@ -41,7 +41,7 @@ PipedAppRunner::Run(const char *command, const char *args, bool findCommand)
 	if (findCommand) {
 		appPath = BTestShell::GlobalTestDir();
 		appPath.CharacterEscape(" \t\n!\"'`$&()?*+{}[]<>|", '\\');
-		appPath += "/../kits/app/";
+		appPath += "/";
 		appPath += command;
 		#ifdef TEST_R5
 			appPath += "_r5";