diff --git a/ecal/tests/cpp/config_test/src/config_test.cpp b/ecal/tests/cpp/config_test/src/config_test.cpp
index da90f6b30a..a245f564eb 100644
--- a/ecal/tests/cpp/config_test/src/config_test.cpp
+++ b/ecal/tests/cpp/config_test/src/config_test.cpp
@@ -109,7 +109,7 @@ TEST(core_cpp_config /*unused*/, user_config_passing /*unused*/)
   EXPECT_EQ(0, eCAL::Finalize());
 }
 
-TEST(ConfigDeathTest /*unused*/, user_config_death_test /*unused*/)
+TEST(core_cpp_config /*unused*/, user_config_death_test /*unused*/)
 {
   eCAL::Configuration custom_config(0, nullptr);
 
@@ -198,7 +198,7 @@ TEST(core_cpp_config /*unused*/, config_custom_datatypes_tests /*unused*/)
   EXPECT_EQ(config1.transport_layer.udp.network.group, testValue);
 }
 
-TEST(CmdParserTest /*unused*/, config_cmd_parser_test /*unused*/)
+TEST(core_cpp_config /*unused*/, config_cmd_parser_test /*unused*/)
 {
   const std::string some_file_name = "someFileName.yml";
 
@@ -222,7 +222,7 @@ TEST(CmdParserTest /*unused*/, config_cmd_parser_test /*unused*/)
 }
 
 #ifdef ECAL_CORE_CONFIGURATION
-TEST(YamlConfigReaderTest /*unused*/, read_write_file_test /*unused*/)
+TEST(core_cpp_config /*unused*/, read_write_file_test /*unused*/)
 {
   // create a custom ini file
   std::string ini_file_name = "customIni.yml";
@@ -249,7 +249,7 @@ TEST(YamlConfigReaderTest /*unused*/, read_write_file_test /*unused*/)
   remove("myTest.yml");
 }
 
-TEST(YamlConfigReaderTest /*unused*/, parse_values_test /*unused*/)
+TEST(core_cpp_config /*unused*/, parse_values_test /*unused*/)
 {
   eCAL::Configuration config{};
   EXPECT_NO_THROW(eCAL::Config::YamlStringToConfig(ini_file_as_string_yaml, config));
@@ -273,7 +273,7 @@ TEST(YamlConfigReaderTest /*unused*/, parse_values_test /*unused*/)
   EXPECT_EQ(config.publisher.layer.shm.acknowledge_timeout_ms, 346U);
 } 
 
-TEST(YamlConfigReaderTest /*unused*/, yaml_node_merger /*unused*/)
+TEST(core_cpp_config /*unused*/, yaml_node_merger /*unused*/)
 {
   YAML::Node node_1{};
   YAML::Node node_2{};
@@ -299,7 +299,7 @@ TEST(YamlConfigReaderTest /*unused*/, yaml_node_merger /*unused*/)
   EXPECT_EQ(node_1["firstLayer2"]["secondLayer2"], node_2["firstLayer2"]["secondLayer2"]);  
 }
 
-TEST(YamlConfigReaderTest /*unused*/, yaml_to_config_merger /*unused*/)
+TEST(core_cpp_config /*unused*/, yaml_to_config_merger /*unused*/)
 {
   // create a custom ini file
   std::string ini_file_name = "customIni.yml";
diff --git a/ecal/tests/cpp/registration_test_public/src/registration_getpublisherids.cpp b/ecal/tests/cpp/registration_test_public/src/registration_getpublisherids.cpp
index 7f20b44bf3..18b5fa6146 100644
--- a/ecal/tests/cpp/registration_test_public/src/registration_getpublisherids.cpp
+++ b/ecal/tests/cpp/registration_test_public/src/registration_getpublisherids.cpp
@@ -33,7 +33,7 @@ struct TestParams
 };
 
 // test class that accepts TestParams as a parameter
-class EcalTest : public ::testing::TestWithParam<TestParams>
+class TestFixture : public ::testing::TestWithParam<TestParams>
 {
 protected:
   void SetUp() override
@@ -50,7 +50,7 @@ class EcalTest : public ::testing::TestWithParam<TestParams>
   }
 };
 
-TEST_P(EcalTest, GetPublisherIDsReturnsCorrectNumber)
+TEST_P(TestFixture, GetPublisherIDsReturnsCorrectNumber)
 {
   {
     // create publishers for testing
@@ -88,7 +88,7 @@ TEST_P(EcalTest, GetPublisherIDsReturnsCorrectNumber)
   ASSERT_EQ(pub_ids2.size(), 0);
 }
 
-TEST_P(EcalTest, PublisherEventCallbackIsTriggered)
+TEST_P(TestFixture, PublisherEventCallbackIsTriggered)
 {
   std::atomic<size_t> created_publisher_num(0);
   std::atomic<size_t> deleted_publisher_num(0);
@@ -149,8 +149,8 @@ TEST_P(EcalTest, PublisherEventCallbackIsTriggered)
 
 // instantiate the test suite with different configurations and publisher counts
 INSTANTIATE_TEST_SUITE_P(
-  GetPublisherIdTests,
-  EcalTest,
+  core_cpp_registration_public,
+  TestFixture,
   ::testing::Values(
     TestParams{ 10, []() {
       // shm
diff --git a/ecal/tests/cpp/registration_test_public/src/registration_getsubscriberids.cpp b/ecal/tests/cpp/registration_test_public/src/registration_getsubscriberids.cpp
index 40ba6a95be..28138fcbc0 100644
--- a/ecal/tests/cpp/registration_test_public/src/registration_getsubscriberids.cpp
+++ b/ecal/tests/cpp/registration_test_public/src/registration_getsubscriberids.cpp
@@ -33,7 +33,7 @@ struct TestParams
 };
 
 // test class that accepts TestParams as a parameter
-class EcalTest : public ::testing::TestWithParam<TestParams>
+class TestFixture : public ::testing::TestWithParam<TestParams>
 {
 protected:
   void SetUp() override
@@ -50,7 +50,7 @@ class EcalTest : public ::testing::TestWithParam<TestParams>
   }
 };
 
-TEST_P(EcalTest, GetSubscriberIDsReturnsCorrectNumber)
+TEST_P(TestFixture, GetSubscriberIDsReturnsCorrectNumber)
 {
   {
     // create subscribers for testing
@@ -88,7 +88,7 @@ TEST_P(EcalTest, GetSubscriberIDsReturnsCorrectNumber)
   ASSERT_EQ(sub_ids2.size(), 0);
 }
 
-TEST_P(EcalTest, SubscriberEventCallbackIsTriggered)
+TEST_P(TestFixture, SubscriberEventCallbackIsTriggered)
 {
   std::atomic<size_t> created_subscriber_num(0);
   std::atomic<size_t> deleted_subscriber_num(0);
@@ -149,8 +149,8 @@ TEST_P(EcalTest, SubscriberEventCallbackIsTriggered)
 
 // instantiate the test suite with different configurations and subscriber counts
 INSTANTIATE_TEST_SUITE_P(
-  GetSubscriberIdTests,
-  EcalTest,
+  core_cpp_registration_public,
+  TestFixture,
   ::testing::Values(
     TestParams{ 10, []() {
       // shm