diff --git a/tests/include/serverBasedTestTools.h b/tests/include/serverBasedTestTools.h
index 53e1f8faa857523e0df72974d8cfd51989356ed6..e85a83e30d208d1c8f7131040271e6cf1d2c27b7 100644
--- a/tests/include/serverBasedTestTools.h
+++ b/tests/include/serverBasedTestTools.h
@@ -14,9 +14,8 @@ static const int ACCESS_RW = 1; // read/write
     GlobalFixture() { ChimeraTK::DoocsAdapter::waitUntilInitialised(); }                                               \
                                                                                                                        \
     ReferenceTestApplication referenceTestApplication{framework::master_test_suite().p_name.value};                    \
-    ThreadedDoocsServer server{framework::master_test_suite().p_name.value,                                            \
-        framework::master_test_suite().p_name.value + ".conf", framework::master_test_suite().argc,                    \
-        framework::master_test_suite().argv};                                                                          \
+    ThreadedDoocsServer server{framework::master_test_suite().p_name.value + ".conf",                                  \
+        framework::master_test_suite().argc, framework::master_test_suite().argv};                                     \
   };                                                                                                                   \
                                                                                                                        \
   BOOST_GLOBAL_FIXTURE(GlobalFixture);
@@ -34,9 +33,8 @@ static const int ACCESS_RW = 1; // read/write
                                                                                                                        \
     static ReferenceTestApplication referenceTestApplication;                                                          \
     static std::string rpcNo;                                                                                          \
-    ThreadedDoocsServer server{framework::master_test_suite().p_name.value,                                            \
-        framework::master_test_suite().p_name.value + ".conf", framework::master_test_suite().argc,                    \
-        framework::master_test_suite().argv};                                                                          \
+    ThreadedDoocsServer server{framework::master_test_suite().p_name.value + ".conf",                                  \
+        framework::master_test_suite().argc, framework::master_test_suite().argv};                                     \
   };                                                                                                                   \
                                                                                                                        \
   ReferenceTestApplication GlobalFixture::referenceTestApplication{BOOST_STRINGIZE(BOOST_TEST_MODULE)};                \
diff --git a/tests/src/serverTestAutoCreateLocations.cpp b/tests/src/serverTestAutoCreateLocations.cpp
index 9880979ed4778ceec92c4e3a28ff8d249c6d48f8..a6386777962958b495cab8c615e5fc59d5a7bbee 100644
--- a/tests/src/serverTestAutoCreateLocations.cpp
+++ b/tests/src/serverTestAutoCreateLocations.cpp
@@ -19,6 +19,12 @@ using namespace boost::unit_test;
 using namespace boost::unit_test_framework;
 using namespace ChimeraTK;
 
+struct InternalTestServer : public ThreadedDoocsServer {
+  InternalTestServer(const std::string& serverName) : ThreadedDoocsServer({}, 0, nullptr, false) {
+    _serverName = serverName;
+  }
+};
+
 struct GlobalFixture {
   GlobalFixture() {
     boost::filesystem::copy_file(framework::master_test_suite().p_name.value + ".template.conf",
@@ -28,7 +34,7 @@ struct GlobalFixture {
   }
 
   ReferenceTestApplication referenceTestApplication{framework::master_test_suite().p_name.value};
-  ThreadedDoocsServer server{BOOST_STRINGIZE(BOOST_TEST_MODULE), {}, 0, nullptr, false};
+  InternalTestServer server{framework::master_test_suite().p_name.value};
 };
 
 BOOST_GLOBAL_FIXTURE(GlobalFixture);
diff --git a/tests/src/serverTestSpectrumArray.cpp b/tests/src/serverTestSpectrumArray.cpp
index 16924b7ae3c18165ea45ae26e8d9e67f944cc40c..fdfa4c34b04dcd03460be399293a05e5f65a64c0 100644
--- a/tests/src/serverTestSpectrumArray.cpp
+++ b/tests/src/serverTestSpectrumArray.cpp
@@ -19,8 +19,8 @@ struct GlobalFixture {
   ~GlobalFixture() { referenceTestApplication.releaseManualLoopControl(); }
 
   static ReferenceTestApplication referenceTestApplication;
-  ThreadedDoocsServer server{BOOST_STRINGIZE(BOOST_TEST_MODULE), BOOST_STRINGIZE(BOOST_TEST_MODULE) ".conf",
-      framework::master_test_suite().argc, framework::master_test_suite().argv};
+  ThreadedDoocsServer server{BOOST_STRINGIZE(BOOST_TEST_MODULE) ".conf", framework::master_test_suite().argc,
+      framework::master_test_suite().argv};
 };
 ReferenceTestApplication GlobalFixture::referenceTestApplication{BOOST_STRINGIZE(BOOST_TEST_MODULE)};