diff --git a/src/tests/kits/app/broster/GetAppInfoTester.cpp b/src/tests/kits/app/broster/GetAppInfoTester.cpp
index 4b2717bf4e..f34d6afa94 100644
--- a/src/tests/kits/app/broster/GetAppInfoTester.cpp
+++ b/src/tests/kits/app/broster/GetAppInfoTester.cpp
@@ -274,19 +274,19 @@ Test* GetAppInfoTester::Suite()
 {
 	TestSuite* SuiteOfTests = new TestSuite;
 
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester, GetAppInfoTestA1);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester, GetAppInfoTestA2);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester, GetAppInfoTestA3);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester, GetAppInfoTestA1);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester, GetAppInfoTestA2);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester, GetAppInfoTestA3);
 
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester, GetAppInfoTestB1);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester, GetAppInfoTestB2);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester, GetAppInfoTestB3);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester, GetAppInfoTestB1);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester, GetAppInfoTestB2);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester, GetAppInfoTestB3);
 
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester,
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester,
 			  GetRunningAppInfoTest1);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester,
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester,
 			  GetRunningAppInfoTest2);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppInfoTester,
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppInfoTester,
 			  GetRunningAppInfoTest3);
 
 	return SuiteOfTests;
diff --git a/src/tests/kits/app/broster/GetAppListTester.cpp b/src/tests/kits/app/broster/GetAppListTester.cpp
index 61358bb543..3c1271ecd7 100644
--- a/src/tests/kits/app/broster/GetAppListTester.cpp
+++ b/src/tests/kits/app/broster/GetAppListTester.cpp
@@ -284,12 +284,12 @@ Test* GetAppListTester::Suite()
 {
 	TestSuite* SuiteOfTests = new TestSuite;
 
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppListTester, GetAppListTestA1);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppListTester, GetAppListTestA2);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppListTester, GetAppListTestA1);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppListTester, GetAppListTestA2);
 
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppListTester, GetAppListTestB1);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppListTester, GetAppListTestB2);
-	ADD_TEST4(BApplication, SuiteOfTests, GetAppListTester, GetAppListTestB3);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppListTester, GetAppListTestB1);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppListTester, GetAppListTestB2);
+	ADD_TEST4(BRoster, SuiteOfTests, GetAppListTester, GetAppListTestB3);
 
 	return SuiteOfTests;
 }
diff --git a/src/tests/kits/app/broster/IsRunningTester.cpp b/src/tests/kits/app/broster/IsRunningTester.cpp
index 5746482ca8..af968b90bd 100644
--- a/src/tests/kits/app/broster/IsRunningTester.cpp
+++ b/src/tests/kits/app/broster/IsRunningTester.cpp
@@ -138,13 +138,13 @@ Test* IsRunningTester::Suite()
 {
 	TestSuite* SuiteOfTests = new TestSuite;
 
-	ADD_TEST4(BApplication, SuiteOfTests, IsRunningTester, IsRunningTestA1);
-	ADD_TEST4(BApplication, SuiteOfTests, IsRunningTester, IsRunningTestA2);
-	ADD_TEST4(BApplication, SuiteOfTests, IsRunningTester, IsRunningTestA3);
+	ADD_TEST4(BRoster, SuiteOfTests, IsRunningTester, IsRunningTestA1);
+	ADD_TEST4(BRoster, SuiteOfTests, IsRunningTester, IsRunningTestA2);
+	ADD_TEST4(BRoster, SuiteOfTests, IsRunningTester, IsRunningTestA3);
 
-	ADD_TEST4(BApplication, SuiteOfTests, IsRunningTester, IsRunningTestB1);
-	ADD_TEST4(BApplication, SuiteOfTests, IsRunningTester, IsRunningTestB2);
-	ADD_TEST4(BApplication, SuiteOfTests, IsRunningTester, IsRunningTestB3);
+	ADD_TEST4(BRoster, SuiteOfTests, IsRunningTester, IsRunningTestB1);
+	ADD_TEST4(BRoster, SuiteOfTests, IsRunningTester, IsRunningTestB2);
+	ADD_TEST4(BRoster, SuiteOfTests, IsRunningTester, IsRunningTestB3);
 
 	return SuiteOfTests;
 }
diff --git a/src/tests/kits/app/broster/TeamForTester.cpp b/src/tests/kits/app/broster/TeamForTester.cpp
index 5a2bed2a90..df193a6bfa 100644
--- a/src/tests/kits/app/broster/TeamForTester.cpp
+++ b/src/tests/kits/app/broster/TeamForTester.cpp
@@ -143,13 +143,13 @@ Test* TeamForTester::Suite()
 {
 	TestSuite* SuiteOfTests = new TestSuite;
 
-	ADD_TEST4(BApplication, SuiteOfTests, TeamForTester, TeamForTestA1);
-	ADD_TEST4(BApplication, SuiteOfTests, TeamForTester, TeamForTestA2);
-	ADD_TEST4(BApplication, SuiteOfTests, TeamForTester, TeamForTestA3);
+	ADD_TEST4(BRoster, SuiteOfTests, TeamForTester, TeamForTestA1);
+	ADD_TEST4(BRoster, SuiteOfTests, TeamForTester, TeamForTestA2);
+	ADD_TEST4(BRoster, SuiteOfTests, TeamForTester, TeamForTestA3);
 
-	ADD_TEST4(BApplication, SuiteOfTests, TeamForTester, TeamForTestB1);
-	ADD_TEST4(BApplication, SuiteOfTests, TeamForTester, TeamForTestB2);
-	ADD_TEST4(BApplication, SuiteOfTests, TeamForTester, TeamForTestB3);
+	ADD_TEST4(BRoster, SuiteOfTests, TeamForTester, TeamForTestB1);
+	ADD_TEST4(BRoster, SuiteOfTests, TeamForTester, TeamForTestB2);
+	ADD_TEST4(BRoster, SuiteOfTests, TeamForTester, TeamForTestB3);
 
 	return SuiteOfTests;
 }