diff --git a/core/src/tests/CMakeLists.txt b/core/src/tests/CMakeLists.txt
index 8bbf3afa3fd..bda5fa2b404 100644
--- a/core/src/tests/CMakeLists.txt
+++ b/core/src/tests/CMakeLists.txt
@@ -395,7 +395,7 @@ endif() # NOT client-only
 
 if(NOT client-only)
   bareos_add_test(
-    messages
+    messages_resource
     LINK_LIBRARIES
       bareos
       dird_objects
diff --git a/core/src/tests/messages.cc b/core/src/tests/messages_resource.cc
similarity index 98%
rename from core/src/tests/messages.cc
rename to core/src/tests/messages_resource.cc
index 9c2aa1deb17..12259409fe7 100644
--- a/core/src/tests/messages.cc
+++ b/core/src/tests/messages_resource.cc
@@ -102,7 +102,7 @@ static bool DbLogInsertCallback_(JobControlRecord* jcr,
   return true;
 }
 
-TEST(messages, send_message_to_all_configured_destinations)
+TEST(messages_resource, send_message_to_all_configured_destinations)
 {
   std::string config_dir = getenv_std_string("BAREOS_CONFIG_DIR");
   std::string working_dir = getenv_std_string("BAREOS_WORKING_DIR");
diff --git a/systemtests/tests/messages-test/testrunner b/systemtests/tests/messages-test/testrunner
index 6cafe9833a1..a4226dcb4d7 100755
--- a/systemtests/tests/messages-test/testrunner
+++ b/systemtests/tests/messages-test/testrunner
@@ -51,7 +51,7 @@ function check_output_file {
 
 start_test
 
-${BAREOS_UNITTESTS_BINARY_DIR}/messages > "$stdout_file" 2> "$stderr_file" || exit_error
+${BAREOS_UNITTESTS_BINARY_DIR}/messages_resource > "$stdout_file" 2> "$stderr_file" || exit_error
 
 check_output_file "$console_messages_file"
 check_output_file "$syslog_file"