diff --git a/LCS/Messaging/python/messaging/test/CMakeLists.txt b/LCS/Messaging/python/messaging/test/CMakeLists.txt
index a4f5902ced4f273bff6e3e566e6e8dc6298ca1ff..6b503a29c317ea140f6c3c13263ae8db82e67cba 100644
--- a/LCS/Messaging/python/messaging/test/CMakeLists.txt
+++ b/LCS/Messaging/python/messaging/test/CMakeLists.txt
@@ -2,19 +2,8 @@
 
 include(LofarCTest)
 
-set(_qpid_tests
-    t_messages
-    t_messagebus
-    t_RPC
-    t_service_message_handler)
+lofar_add_test(t_messages)
+lofar_add_test(t_messagebus)
+lofar_add_test(t_service_message_handler)
+lofar_add_test(t_RPC)
 
-execute_process(COMMAND qpid-config RESULT_VARIABLE QPID_CONFIG_RESULT OUTPUT_QUIET ERROR_QUIET)
-
-if(${QPID_CONFIG_RESULT} EQUAL 0)
- foreach(_test ${_qpid_tests})
-   lofar_add_test(${_test})
- endforeach()
-else()
-  lofar_join_arguments(_qpid_tests)
-  message(WARNING "No running qpid daemon found. The following tests will not be run: ${_qpid_tests}")
-endif()