diff --git a/server/core/test/test_modulecmd.cc b/server/core/test/test_modulecmd.cc
index d28c5b894..3f808863b 100644
--- a/server/core/test/test_modulecmd.cc
+++ b/server/core/test/test_modulecmd.cc
@@ -17,6 +17,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
+#include <maxscale/messagequeue.hh>
 #include <maxscale/paths.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/session.h>
@@ -464,6 +465,8 @@ int main(int argc, char **argv)
 {
     int rc = 0;
 
+    mxs::MessageQueue::init();
+
     rc += test_arguments();
     rc += test_optional_arguments();
     rc += test_module_errors();
diff --git a/server/modules/monitor/mariadbmon/test/test_cycle_find.cc b/server/modules/monitor/mariadbmon/test/test_cycle_find.cc
index 027b7ec9e..85c0fff2f 100644
--- a/server/modules/monitor/mariadbmon/test/test_cycle_find.cc
+++ b/server/modules/monitor/mariadbmon/test/test_cycle_find.cc
@@ -19,6 +19,7 @@
 #include <sstream>
 #include <vector>
 #include <maxscale/alloc.h>
+#include <maxscale/messagequeue.hh>
 #include <set>
 
 using std::string;
@@ -69,6 +70,8 @@ private:
 
 int main()
 {
+    mxs::MessageQueue::init();
+
     MariaDBMonitor::Test tester;
     return tester.run_tests();
 }