diff --git a/ecal/tests/CMakeLists.txt b/ecal/tests/CMakeLists.txt
index 5bab408e90..a58b369082 100644
--- a/ecal/tests/CMakeLists.txt
+++ b/ecal/tests/CMakeLists.txt
@@ -33,7 +33,7 @@ add_subdirectory(cpp/descgate_test)
 add_subdirectory(cpp/config_test)
 
 if(ECAL_CORE_REGISTRATION)
-  add_subdirectory(cpp/registration_test)
+  add_subdirectory(cpp/registration_test_2)
 endif()
 
 add_subdirectory(cpp/event_test)
diff --git a/ecal/tests/cpp/registration_test/CMakeLists.txt b/ecal/tests/cpp/registration_test_2/CMakeLists.txt
similarity index 97%
rename from ecal/tests/cpp/registration_test/CMakeLists.txt
rename to ecal/tests/cpp/registration_test_2/CMakeLists.txt
index ad99c4739c..e7b7db3dd2 100644
--- a/ecal/tests/cpp/registration_test/CMakeLists.txt
+++ b/ecal/tests/cpp/registration_test_2/CMakeLists.txt
@@ -16,7 +16,7 @@
 #
 # ========================= eCAL LICENSE =================================
 
-project(test_registration)
+project(test_registration_2)
 
 find_package(Threads REQUIRED)
 find_package(GTest REQUIRED)
@@ -52,7 +52,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)
 
 ecal_install_gtest(${PROJECT_NAME})
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/registration)
+set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER tests/cpp/registration_2)
 
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES 
     ${${PROJECT_NAME}_src}
diff --git a/ecal/tests/cpp/registration_test/src/registration_getclients.cpp b/ecal/tests/cpp/registration_test_2/src/registration_getclients.cpp
similarity index 100%
rename from ecal/tests/cpp/registration_test/src/registration_getclients.cpp
rename to ecal/tests/cpp/registration_test_2/src/registration_getclients.cpp
diff --git a/ecal/tests/cpp/registration_test/src/registration_getservices.cpp b/ecal/tests/cpp/registration_test_2/src/registration_getservices.cpp
similarity index 96%
rename from ecal/tests/cpp/registration_test/src/registration_getservices.cpp
rename to ecal/tests/cpp/registration_test_2/src/registration_getservices.cpp
index 3808304ee3..7aba62527f 100644
--- a/ecal/tests/cpp/registration_test/src/registration_getservices.cpp
+++ b/ecal/tests/cpp/registration_test_2/src/registration_getservices.cpp
@@ -26,10 +26,10 @@ enum {
   CMN_REGISTRATION_REFRESH_MS = (1000)
 };
 
-TEST(core_cpp_registration, ServiceExpiration)
+TEST(core_cpp_registration_2, ServiceExpiration)
 {
   // initialize eCAL API
-  eCAL::Initialize(0, nullptr, "core_cpp_registration");
+  eCAL::Initialize(0, nullptr, "core_cpp_registration_2");
 
   // enable loop back communication in the same process
   eCAL::Util::EnableLoopback(true);
@@ -85,10 +85,10 @@ TEST(core_cpp_registration, ServiceExpiration)
   eCAL::Finalize();
 }
 
-TEST(core_cpp_registration, ServiceEqualQualities)
+TEST(core_cpp_registration_2, ServiceEqualQualities)
 {
   // initialize eCAL API
-  eCAL::Initialize(0, nullptr, "core_cpp_registration");
+  eCAL::Initialize(0, nullptr, "core_cpp_registration_2");
 
   // enable loop back communication in the same process
   eCAL::Util::EnableLoopback(true);
@@ -175,10 +175,10 @@ TEST(core_cpp_registration, ServiceEqualQualities)
   eCAL::Finalize();
 }
 
-TEST(core_cpp_registration, ServiceDifferentQualities)
+TEST(core_cpp_registration_2, ServiceDifferentQualities)
 {
   // initialize eCAL API
-  eCAL::Initialize(0, nullptr, "core_cpp_registration");
+  eCAL::Initialize(0, nullptr, "core_cpp_registration_2");
 
   // enable loop back communication in the same process
   eCAL::Util::EnableLoopback(true);
diff --git a/ecal/tests/cpp/registration_test/src/registration_gettopics.cpp b/ecal/tests/cpp/registration_test_2/src/registration_gettopics.cpp
similarity index 97%
rename from ecal/tests/cpp/registration_test/src/registration_gettopics.cpp
rename to ecal/tests/cpp/registration_test_2/src/registration_gettopics.cpp
index 3c9335763b..c0127164aa 100644
--- a/ecal/tests/cpp/registration_test/src/registration_gettopics.cpp
+++ b/ecal/tests/cpp/registration_test_2/src/registration_gettopics.cpp
@@ -31,10 +31,10 @@ enum {
   CMN_REGISTRATION_REFRESH_MS = (1000)
 };
 
-TEST(core_cpp_registration, GetTopics)
+TEST(core_cpp_registration_2, GetTopics)
 {
   // initialize eCAL API
-  eCAL::Initialize(0, nullptr, "core_cpp_registration");
+  eCAL::Initialize(0, nullptr, "core_cpp_registration_2");
 
   // enable loop back communication in the same process
   eCAL::Util::EnableLoopback(true);
@@ -135,14 +135,14 @@ TEST(core_cpp_registration, GetTopics)
   eCAL::Finalize();
 }
 
-TEST(core_cpp_registration, GetTopicsParallel)
+TEST(core_cpp_registration_2, GetTopicsParallel)
 {
   constexpr const int max_publisher_count(2000);
   constexpr const int waiting_time_thread(4000);
   constexpr const int parallel_threads(1);
 
   // initialize eCAL API
-  eCAL::Initialize(0, nullptr, "core_cpp_registration");
+  eCAL::Initialize(0, nullptr, "core_cpp_registration_2");
 
   // enable loop back communication in the same process
   eCAL::Util::EnableLoopback(true);