diff --git a/LCS/Messaging/python/messaging/test/CMakeLists.txt b/LCS/Messaging/python/messaging/test/CMakeLists.txt
index 361727be5357441a3abe5f8bf3a66c8853f99871..a4f5902ced4f273bff6e3e566e6e8dc6298ca1ff 100644
--- a/LCS/Messaging/python/messaging/test/CMakeLists.txt
+++ b/LCS/Messaging/python/messaging/test/CMakeLists.txt
@@ -8,12 +8,13 @@ set(_qpid_tests
     t_RPC
     t_service_message_handler)
 
-if(HAVE_QPID)
+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 "Qpid is not set."
-    "The following tests will not be run: ${_qpid_tests}")
+  message(WARNING "No running qpid daemon found. The following tests will not be run: ${_qpid_tests}")
 endif()
diff --git a/SAS/OTDB_Services/test/CMakeLists.txt b/SAS/OTDB_Services/test/CMakeLists.txt
index 513a09629072e60ae5465fda6babbf58318636b9..3336d559d7ea6d35fecbd32f9cf4d81c9301bdc7 100644
--- a/SAS/OTDB_Services/test/CMakeLists.txt
+++ b/SAS/OTDB_Services/test/CMakeLists.txt
@@ -8,12 +8,13 @@ set(_qpid_tests
     t_TreeService
     t_TreeStatusEvents)
 
-if(HAVE_QPID)
+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 "Qpid is not set."
-    "The following tests will not be run: ${_qpid_tests}")
+  message(WARNING "No running qpid daemon found. The following tests will not be run: ${_qpid_tests}")
 endif()