diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index f1544a890..ab89d4df3 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -18,10 +18,9 @@ set(TEST_DEFINITIONS "" CACHE INTERNAL "")
 # utilities.cmake contains all helper functions and extra tools
 include(utilities.cmake)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(maxtest/include)
 # Include the CDC connector headers
 include_directories(${CMAKE_SOURCE_DIR}/connectors/cdc-connector)
-include_directories(maxtest/include)
 
 # Tool used to check backend state
 add_test_executable_notest(check_backend.cpp check_backend check_backend LABELS CONFIG REPL_BACKEND GALERA_BACKEND SECOND_MAXSCALE)
diff --git a/maxscale-system-test/fail_switch_rejoin_common.cpp b/maxscale-system-test/mariadbmonitor/fail_switch_rejoin_common.cpp
similarity index 100%
rename from maxscale-system-test/fail_switch_rejoin_common.cpp
rename to maxscale-system-test/mariadbmonitor/fail_switch_rejoin_common.cpp
diff --git a/maxscale-system-test/failover_common.cpp b/maxscale-system-test/mariadbmonitor/failover_common.cpp
similarity index 100%
rename from maxscale-system-test/failover_common.cpp
rename to maxscale-system-test/mariadbmonitor/failover_common.cpp
diff --git a/maxscale-system-test/pam_authentication.cpp b/maxscale-system-test/pam_authentication.cpp
index 246118f6e..6bf9aadb8 100644
--- a/maxscale-system-test/pam_authentication.cpp
+++ b/maxscale-system-test/pam_authentication.cpp
@@ -12,7 +12,7 @@
  */
 
 #include <maxtest/testconnections.h>
-#include "fail_switch_rejoin_common.cpp"
+#include "mariadbmonitor/fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>