diff --git a/server/modules/filter/test/maxscale/filtermodule.hh b/server/modules/filter/test/maxscale/filtermodule.hh
index 0838c5e0e..a76d19337 100644
--- a/server/modules/filter/test/maxscale/filtermodule.hh
+++ b/server/modules/filter/test/maxscale/filtermodule.hh
@@ -187,10 +187,11 @@ private:
     }
 
 private:
-    friend Base;
+    // Not accepted by CentOS6: friend Base;
+    friend class SpecificModule<FilterModule, MXS_FILTER_OBJECT>;
 
     FilterModule(const MXS_MODULE* pModule)
-        : Base(pModule)
+        : SpecificModule<FilterModule, MXS_FILTER_OBJECT>(pModule)
     {
     }
 };
diff --git a/server/modules/filter/test/mock_backend.cc b/server/modules/filter/test/mock_backend.cc
index 06c69fc6a..1d69e698c 100644
--- a/server/modules/filter/test/mock_backend.cc
+++ b/server/modules/filter/test/mock_backend.cc
@@ -13,6 +13,7 @@
 
 #include "maxscale/mock/backend.hh"
 #include <algorithm>
+#include <vector>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>
 #include <iostream>
diff --git a/server/modules/filter/test/module.cc b/server/modules/filter/test/module.cc
index d27de908f..4d6291a9f 100644
--- a/server/modules/filter/test/module.cc
+++ b/server/modules/filter/test/module.cc
@@ -12,6 +12,7 @@
  */
 
 #include "maxscale/module.hh"
+#include <string>
 #include "../../../core/internal/modules.h"
 
 using std::auto_ptr;
@@ -78,7 +79,7 @@ const char* Module::ConfigParameters::get(const char* zName) const
 
 void Module::ConfigParameters::set_value(const char* zName, const char* zValue)
 {
-    return set_value(zName, std::string(zValue));
+    set_value(zName, std::string(zValue));
 }
 
 void Module::ConfigParameters::set_value(const char* zName, const std::string& value)