diff --git a/server/modules/filter/dbfwfilter/test/CMakeLists.txt b/server/modules/filter/dbfwfilter/test/CMakeLists.txt
index 1b23623db..3482f46e0 100644
--- a/server/modules/filter/dbfwfilter/test/CMakeLists.txt
+++ b/server/modules/filter/dbfwfilter/test/CMakeLists.txt
@@ -1,15 +1,18 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../test)
+
 add_executable(test_dbfwfilter
   test_dbfwfilter.cc
-
-  filtermodule.cc
-  mock.cc
-  mock_backend.cc
-  mock_client.cc
-  mock_dcb.cc
-  mock_routersession.cc
-  mock_session.cc
-  module.cc
   tempfile.cc
+
+  ../../test/filtermodule.cc
+  ../../test/mock.cc
+  ../../test/mock_backend.cc
+  ../../test/mock_client.cc
+  ../../test/mock_dcb.cc
+  ../../test/mock_routersession.cc
+  ../../test/mock_session.cc
+  ../../test/module.cc
+  ../../test/queryclassifiermodule.cc
 )
 target_link_libraries(test_dbfwfilter maxscale-common)
 
diff --git a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
index 9478189bd..402511560 100644
--- a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
@@ -15,12 +15,12 @@
 #include <memory>
 #include <iostream>
 #include <maxscale/log_manager.h>
-#include "maxscale/filtermodule.hh"
-#include "maxscale/queryclassifiermodule.hh"
-#include "maxscale/mock/backend.hh"
-#include "maxscale/mock/routersession.hh"
-#include "maxscale/mock/session.hh"
-#include "maxscale/mock/client.hh"
+#include <maxscale/filtermodule.hh>
+#include <maxscale/queryclassifiermodule.hh>
+#include <maxscale/mock/backend.hh>
+#include <maxscale/mock/routersession.hh>
+#include <maxscale/mock/session.hh>
+#include <maxscale/mock/client.hh>
 #include "tempfile.hh"
 
 using namespace std;
diff --git a/server/modules/filter/dbfwfilter/test/filtermodule.cc b/server/modules/filter/test/filtermodule.cc
similarity index 95%
rename from server/modules/filter/dbfwfilter/test/filtermodule.cc
rename to server/modules/filter/test/filtermodule.cc
index 5edf85794..aee8f40a9 100644
--- a/server/modules/filter/dbfwfilter/test/filtermodule.cc
+++ b/server/modules/filter/test/filtermodule.cc
@@ -12,8 +12,8 @@
  */
 
 #include <maxscale/cppdefs.hh>
-#include "maxscale/filtermodule.hh"
-#include "../../../../core/maxscale/modules.h"
+#include <maxscale/filtermodule.hh>
+#include "../../../core/maxscale/modules.h"
 
 using std::auto_ptr;
 
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/filtermodule.hh b/server/modules/filter/test/maxscale/filtermodule.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/filtermodule.hh
rename to server/modules/filter/test/maxscale/filtermodule.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/mock/backend.hh b/server/modules/filter/test/maxscale/mock/backend.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/mock/backend.hh
rename to server/modules/filter/test/maxscale/mock/backend.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/mock/client.hh b/server/modules/filter/test/maxscale/mock/client.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/mock/client.hh
rename to server/modules/filter/test/maxscale/mock/client.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/mock/dcb.hh b/server/modules/filter/test/maxscale/mock/dcb.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/mock/dcb.hh
rename to server/modules/filter/test/maxscale/mock/dcb.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/mock/mock.hh b/server/modules/filter/test/maxscale/mock/mock.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/mock/mock.hh
rename to server/modules/filter/test/maxscale/mock/mock.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/mock/routersession.hh b/server/modules/filter/test/maxscale/mock/routersession.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/mock/routersession.hh
rename to server/modules/filter/test/maxscale/mock/routersession.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/mock/session.hh b/server/modules/filter/test/maxscale/mock/session.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/mock/session.hh
rename to server/modules/filter/test/maxscale/mock/session.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/module.hh b/server/modules/filter/test/maxscale/module.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/module.hh
rename to server/modules/filter/test/maxscale/module.hh
diff --git a/server/modules/filter/dbfwfilter/test/maxscale/queryclassifiermodule.hh b/server/modules/filter/test/maxscale/queryclassifiermodule.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/maxscale/queryclassifiermodule.hh
rename to server/modules/filter/test/maxscale/queryclassifiermodule.hh
diff --git a/server/modules/filter/dbfwfilter/test/mock.cc b/server/modules/filter/test/mock.cc
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/mock.cc
rename to server/modules/filter/test/mock.cc
diff --git a/server/modules/filter/dbfwfilter/test/mock_backend.cc b/server/modules/filter/test/mock_backend.cc
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/mock_backend.cc
rename to server/modules/filter/test/mock_backend.cc
diff --git a/server/modules/filter/dbfwfilter/test/mock_client.cc b/server/modules/filter/test/mock_client.cc
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/mock_client.cc
rename to server/modules/filter/test/mock_client.cc
diff --git a/server/modules/filter/dbfwfilter/test/mock_dcb.cc b/server/modules/filter/test/mock_dcb.cc
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/mock_dcb.cc
rename to server/modules/filter/test/mock_dcb.cc
diff --git a/server/modules/filter/dbfwfilter/test/mock_routersession.cc b/server/modules/filter/test/mock_routersession.cc
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/mock_routersession.cc
rename to server/modules/filter/test/mock_routersession.cc
diff --git a/server/modules/filter/dbfwfilter/test/mock_session.cc b/server/modules/filter/test/mock_session.cc
similarity index 100%
rename from server/modules/filter/dbfwfilter/test/mock_session.cc
rename to server/modules/filter/test/mock_session.cc
diff --git a/server/modules/filter/dbfwfilter/test/module.cc b/server/modules/filter/test/module.cc
similarity index 97%
rename from server/modules/filter/dbfwfilter/test/module.cc
rename to server/modules/filter/test/module.cc
index 6a6d3b0a4..cdd403076 100644
--- a/server/modules/filter/dbfwfilter/test/module.cc
+++ b/server/modules/filter/test/module.cc
@@ -11,8 +11,8 @@
  * Public License.
  */
 
-#include "maxscale/module.hh"
-#include "../../../../core/maxscale/modules.h"
+#include <maxscale/module.hh>
+#include "../../../core/maxscale/modules.h"
 
 namespace maxscale
 {
diff --git a/server/modules/filter/dbfwfilter/test/queryclassifiermodule.cc b/server/modules/filter/test/queryclassifiermodule.cc
similarity index 91%
rename from server/modules/filter/dbfwfilter/test/queryclassifiermodule.cc
rename to server/modules/filter/test/queryclassifiermodule.cc
index 29f50087f..0ec88677b 100644
--- a/server/modules/filter/dbfwfilter/test/queryclassifiermodule.cc
+++ b/server/modules/filter/test/queryclassifiermodule.cc
@@ -12,7 +12,7 @@
  */
 
 #include "maxscale/queryclassifiermodule.hh"
-#include "../../../../core/maxscale/modules.h"
+#include "../../../core/maxscale/modules.h"
 
 namespace maxscale
 {