diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index a3b2eb530..7686d4f2f 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -26,6 +26,7 @@ include_directories(${CMAKE_BINARY_DIR})
 # Include the CDC connector headers
 include_directories(${CMAKE_SOURCE_DIR}/../connectors/cdc-connector/)
 include_directories(maxtest/include/maxtest)
+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/maxtest/CMakeLists.txt b/maxscale-system-test/maxtest/CMakeLists.txt
index 8e1d2119d..febd4f0ab 100644
--- a/maxscale-system-test/maxtest/CMakeLists.txt
+++ b/maxscale-system-test/maxtest/CMakeLists.txt
@@ -1,2 +1 @@
-include_directories(include/maxtest)
 add_subdirectory(src)
diff --git a/maxscale-system-test/maxtest/include/maxtest/blob_test.h b/maxscale-system-test/maxtest/include/maxtest/blob_test.h
index f8e166b89..b5d724130 100644
--- a/maxscale-system-test/maxtest/include/maxtest/blob_test.h
+++ b/maxscale-system-test/maxtest/include/maxtest/blob_test.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 /**
  * @brief test_longblob INSERT big amount of data into lobg_blob_table
diff --git a/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h b/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h
index 7c86b17a5..069e77055 100644
--- a/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h
+++ b/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h
@@ -23,8 +23,8 @@
 
 #include <errno.h>
 #include <string>
-#include "nodes.hh"
-#include "mariadb_nodes.h"
+#include <maxtest/nodes.hh>
+#include <maxtest/mariadb_nodes.h>
 
 #define CLUSTRIX_DEPS_YUM "yum install -y bzip2 wget screen ntp ntpdate vim htop mdadm"
 #define WGET_CLUSTRIX     "wget http://files.clustrix.com/releases/software/clustrix-9.1.4.el7.tar.bz2"
diff --git a/maxscale-system-test/maxtest/include/maxtest/config_operations.h b/maxscale-system-test/maxtest/include/maxtest/config_operations.h
index 862eadaad..490e16fdc 100644
--- a/maxscale-system-test/maxtest/include/maxtest/config_operations.h
+++ b/maxscale-system-test/maxtest/include/maxtest/config_operations.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <string>
 #include <set>
 
diff --git a/maxscale-system-test/maxtest/include/maxtest/different_size.h b/maxscale-system-test/maxtest/include/maxtest/different_size.h
index 1a319e583..5e86bffc2 100644
--- a/maxscale-system-test/maxtest/include/maxtest/different_size.h
+++ b/maxscale-system-test/maxtest/include/maxtest/different_size.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 /**
  * @brief create_event_size Creates SQL query to generate even of given size
diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
index 1f71831a2..7a1bb3ede 100644
--- a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
+++ b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h
@@ -13,10 +13,10 @@
  */
 
 
-#include "mariadb_func.h"
+#include <maxtest/mariadb_func.h>
 #include <errno.h>
 #include <string>
-#include "nodes.hh"
+#include <maxtest/nodes.hh>
 
 /**
  * @brief A class to handle backend nodes
diff --git a/maxscale-system-test/maxtest/include/maxtest/maxrest.hh b/maxscale-system-test/maxtest/include/maxtest/maxrest.hh
index 89659585f..96d372b0a 100644
--- a/maxscale-system-test/maxtest/include/maxtest/maxrest.hh
+++ b/maxscale-system-test/maxtest/include/maxtest/maxrest.hh
@@ -12,7 +12,7 @@
  */
 #pragma once
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <maxscale/jansson.hh>
 
 /**
diff --git a/maxscale-system-test/maxtest/include/maxtest/maxscales.hh b/maxscale-system-test/maxtest/include/maxtest/maxscales.hh
index 6d37271f7..67c0e8c4b 100644
--- a/maxscale-system-test/maxtest/include/maxtest/maxscales.hh
+++ b/maxscale-system-test/maxtest/include/maxtest/maxscales.hh
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <string>
-#include "nodes.hh"
-#include "mariadb_func.h"
-#include "mariadb_nodes.h"
+#include <maxtest/nodes.hh>
+#include <maxtest/mariadb_func.h>
+#include <maxtest/mariadb_nodes.h>
 
 class Maxscales: public Nodes
 {
diff --git a/maxscale-system-test/maxtest/include/maxtest/nodes.hh b/maxscale-system-test/maxtest/include/maxtest/nodes.hh
index 7db5d4325..14f5fd2f2 100644
--- a/maxscale-system-test/maxtest/include/maxtest/nodes.hh
+++ b/maxscale-system-test/maxtest/include/maxtest/nodes.hh
@@ -6,7 +6,7 @@
 #include <string>
 
 #include <maxbase/ccdefs.hh>
-#include "mariadb_func.h"
+#include <maxtest/mariadb_func.h>
 
 typedef std::set<std::string> StringSet;
 
diff --git a/maxscale-system-test/maxtest/include/maxtest/rds_vpc.h b/maxscale-system-test/maxtest/include/maxtest/rds_vpc.h
index 690f23723..a31d421fb 100644
--- a/maxscale-system-test/maxtest/include/maxtest/rds_vpc.h
+++ b/maxscale-system-test/maxtest/include/maxtest/rds_vpc.h
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <unistd.h>
 #include <jansson.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 class RDS
 {
diff --git a/maxscale-system-test/maxtest/include/maxtest/test_info.hh b/maxscale-system-test/maxtest/include/maxtest/test_info.hh
index 7eb5ad61a..a487542d1 100644
--- a/maxscale-system-test/maxtest/include/maxtest/test_info.hh
+++ b/maxscale-system-test/maxtest/include/maxtest/test_info.hh
@@ -1,5 +1,5 @@
 #pragma once
-#include "test_dir.hh"
+#include <maxtest/test_dir.hh>
 
 struct TestDefinition
 {
diff --git a/maxscale-system-test/maxtest/include/maxtest/testconnections.h b/maxscale-system-test/maxtest/include/maxtest/testconnections.h
index ff5701f9b..fa5bc402d 100644
--- a/maxscale-system-test/maxtest/include/maxtest/testconnections.h
+++ b/maxscale-system-test/maxtest/include/maxtest/testconnections.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mariadb_nodes.h"
-#include "clustrix_nodes.h"
-#include "maxscales.hh"
-#include "test_dir.hh"
+#include <maxtest/mariadb_nodes.h>
+#include <maxtest/clustrix_nodes.h>
+#include <maxtest/maxscales.hh>
+#include <maxtest/test_dir.hh>
 #include <fcntl.h>
 #include <pthread.h>
 #include <sys/time.h>
diff --git a/maxscale-system-test/maxtest/src/big_load.cc b/maxscale-system-test/maxtest/src/big_load.cc
index 859655310..f18ac582c 100644
--- a/maxscale-system-test/maxtest/src/big_load.cc
+++ b/maxscale-system-test/maxtest/src/big_load.cc
@@ -1,9 +1,9 @@
-#include "big_load.h"
+#include <maxtest/big_load.h>
 
 #include <pthread.h>
-#include "testconnections.h"
-#include "sql_t1.h"
-#include "get_com_select_insert.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/get_com_select_insert.h>
 
 
 void load(long int* new_inserts,
diff --git a/maxscale-system-test/maxtest/src/blob_test.cc b/maxscale-system-test/maxtest/src/blob_test.cc
index d36f3108f..e6faa0749 100644
--- a/maxscale-system-test/maxtest/src/blob_test.cc
+++ b/maxscale-system-test/maxtest/src/blob_test.cc
@@ -1,4 +1,4 @@
-#include "blob_test.h"
+#include <maxtest/blob_test.h>
 
 int test_longblob(TestConnections* Test,
                   MYSQL* conn,
diff --git a/maxscale-system-test/maxtest/src/clustrix_nodes.cpp b/maxscale-system-test/maxtest/src/clustrix_nodes.cpp
index 1faa2db4e..c18062005 100644
--- a/maxscale-system-test/maxtest/src/clustrix_nodes.cpp
+++ b/maxscale-system-test/maxtest/src/clustrix_nodes.cpp
@@ -14,8 +14,7 @@
 #include <fstream>
 #include <iostream>
 #include <regex>
-#include <sstream>
-#include "clustrix_nodes.h"
+#include <maxtest/clustrix_nodes.h>
 
 int Clustrix_nodes::prepare_server(int m)
 {
diff --git a/maxscale-system-test/maxtest/src/config_operations.cc b/maxscale-system-test/maxtest/src/config_operations.cc
index caa976d41..adb93e03d 100644
--- a/maxscale-system-test/maxtest/src/config_operations.cc
+++ b/maxscale-system-test/maxtest/src/config_operations.cc
@@ -1,4 +1,4 @@
-#include "config_operations.h"
+#include <maxtest/config_operations.h>
 
 // The configuration should use these names for the services, listeners and monitors
 #define SERVICE_NAME1  "rwsplit-service"
diff --git a/maxscale-system-test/maxtest/src/different_size.cc b/maxscale-system-test/maxtest/src/different_size.cc
index 5ef8015cb..773147fef 100644
--- a/maxscale-system-test/maxtest/src/different_size.cc
+++ b/maxscale-system-test/maxtest/src/different_size.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/maxtest/src/envv.cc b/maxscale-system-test/maxtest/src/envv.cc
index 70560633f..108cf0bc4 100644
--- a/maxscale-system-test/maxtest/src/envv.cc
+++ b/maxscale-system-test/maxtest/src/envv.cc
@@ -1,4 +1,4 @@
-#include "envv.hh"
+#include <maxtest/envv.hh>
 
 #include <cstring>
 #include <cstdarg>
diff --git a/maxscale-system-test/maxtest/src/execute_cmd.cc b/maxscale-system-test/maxtest/src/execute_cmd.cc
index 68c85a49b..07a797956 100644
--- a/maxscale-system-test/maxtest/src/execute_cmd.cc
+++ b/maxscale-system-test/maxtest/src/execute_cmd.cc
@@ -1,9 +1,8 @@
 #include <iostream>
-#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "execute_cmd.hh"
+#include <maxtest/execute_cmd.hh>
 
 using namespace std;
 
diff --git a/maxscale-system-test/maxtest/src/fw_copy_rules.cc b/maxscale-system-test/maxtest/src/fw_copy_rules.cc
index 4ffca302b..f19b9de98 100644
--- a/maxscale-system-test/maxtest/src/fw_copy_rules.cc
+++ b/maxscale-system-test/maxtest/src/fw_copy_rules.cc
@@ -1,6 +1,6 @@
-#include "fw_copy_rules.h"
+#include <maxtest/fw_copy_rules.h>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void copy_rules(TestConnections* Test, const char* rules_name, const char* rules_dir)
 {
diff --git a/maxscale-system-test/maxtest/src/get_com_select_insert.cc b/maxscale-system-test/maxtest/src/get_com_select_insert.cc
index 35e468f88..de5d10ee7 100644
--- a/maxscale-system-test/maxtest/src/get_com_select_insert.cc
+++ b/maxscale-system-test/maxtest/src/get_com_select_insert.cc
@@ -1,4 +1,4 @@
-#include "mariadb_nodes.h"
+#include <maxtest/mariadb_nodes.h>
 
 /**
  *  Reads COM_SELECT and COM_INSERT variables from all nodes and stores into 'selects' and 'inserts'
diff --git a/maxscale-system-test/maxtest/src/keepalived_func.cc b/maxscale-system-test/maxtest/src/keepalived_func.cc
index 57e65c537..4d4ee1d9a 100644
--- a/maxscale-system-test/maxtest/src/keepalived_func.cc
+++ b/maxscale-system-test/maxtest/src/keepalived_func.cc
@@ -1,6 +1,6 @@
 #include "keepalived_func.h"
 #include "get_my_ip.h"
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 char* print_version_string(TestConnections* Test)
 {
diff --git a/maxscale-system-test/maxtest/src/mariadb_func.cc b/maxscale-system-test/maxtest/src/mariadb_func.cc
index 34ca954b8..665951021 100644
--- a/maxscale-system-test/maxtest/src/mariadb_func.cc
+++ b/maxscale-system-test/maxtest/src/mariadb_func.cc
@@ -11,8 +11,8 @@
  */
 
 
-#include "mariadb_func.h"
-#include "test_dir.hh"
+#include <maxtest/mariadb_func.h>
+#include <maxtest/test_dir.hh>
 #include <ctype.h>
 #include <sstream>
 
diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cc b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
index 9a6295c25..7086d74ff 100644
--- a/maxscale-system-test/maxtest/src/mariadb_nodes.cc
+++ b/maxscale-system-test/maxtest/src/mariadb_nodes.cc
@@ -10,7 +10,7 @@
  * @endverbatim
  */
 
-#include "mariadb_nodes.h"
+#include <maxtest/mariadb_nodes.h>
 #include <climits>
 #include <string>
 #include <sstream>
@@ -19,7 +19,7 @@
 #include <future>
 #include <functional>
 #include <algorithm>
-#include "envv.hh"
+#include <maxtest/envv.hh>
 
 using std::cout;
 using std::endl;
diff --git a/maxscale-system-test/maxtest/src/maxinfo_func.cc b/maxscale-system-test/maxtest/src/maxinfo_func.cc
index edd11d977..41715a273 100644
--- a/maxscale-system-test/maxtest/src/maxinfo_func.cc
+++ b/maxscale-system-test/maxtest/src/maxinfo_func.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <stdio.h>
 #include <sys/socket.h>
diff --git a/maxscale-system-test/maxtest/src/maxscales.cc b/maxscale-system-test/maxtest/src/maxscales.cc
index d7b82fec4..be45410b6 100644
--- a/maxscale-system-test/maxtest/src/maxscales.cc
+++ b/maxscale-system-test/maxtest/src/maxscales.cc
@@ -1,6 +1,6 @@
-#include "maxscales.hh"
+#include <maxtest/maxscales.hh>
 #include <string>
-#include "envv.hh"
+#include <maxtest/envv.hh>
 
 #define DEFAULT_MAXSCALE_CNF "/etc/maxscale.cnf"
 #define DEFAULT_MAXSCALE_LOG_DIR "/var/log/maxscale/"
diff --git a/maxscale-system-test/maxtest/src/nodes.cc b/maxscale-system-test/maxtest/src/nodes.cc
index 210af899b..1e1d2b746 100644
--- a/maxscale-system-test/maxtest/src/nodes.cc
+++ b/maxscale-system-test/maxtest/src/nodes.cc
@@ -1,4 +1,4 @@
-#include "nodes.hh"
+#include <maxtest/nodes.hh>
 #include <string>
 #include <cstring>
 #include <iostream>
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <signal.h>
 
-#include "envv.hh"
+#include <maxtest/envv.hh>
 
 Nodes::Nodes(const char* pref,
              const std::string& network_config,
diff --git a/maxscale-system-test/maxtest/src/rds_vpc.cc b/maxscale-system-test/maxtest/src/rds_vpc.cc
index 62ac3d3cc..ebaf83707 100644
--- a/maxscale-system-test/maxtest/src/rds_vpc.cc
+++ b/maxscale-system-test/maxtest/src/rds_vpc.cc
@@ -1,4 +1,4 @@
-#include "execute_cmd.hh"
+#include <maxtest/execute_cmd.hh>
 #include "rds_vpc.h"
 
 RDS::RDS(char* cluster)
diff --git a/maxscale-system-test/maxtest/src/sql_t1.cc b/maxscale-system-test/maxtest/src/sql_t1.cc
index a27b8c071..3aace0689 100644
--- a/maxscale-system-test/maxtest/src/sql_t1.cc
+++ b/maxscale-system-test/maxtest/src/sql_t1.cc
@@ -1,8 +1,8 @@
-#include "sql_t1.h"
+#include <maxtest/sql_t1.h>
 
 #include <cstdio>
 #include <pthread.h>
-#include "mariadb_func.h"
+#include <maxtest/mariadb_func.h>
 
 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static char** sql = NULL;
diff --git a/maxscale-system-test/maxtest/src/test_binlog_fnc.cc b/maxscale-system-test/maxtest/src/test_binlog_fnc.cc
index c3e17cdc4..207cb29fd 100644
--- a/maxscale-system-test/maxtest/src/test_binlog_fnc.cc
+++ b/maxscale-system-test/maxtest/src/test_binlog_fnc.cc
@@ -1,7 +1,7 @@
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/sql_t1.h>
 
 #include "test_binlog_fnc.h"
 
diff --git a/maxscale-system-test/maxtest/src/test_info.cc.in b/maxscale-system-test/maxtest/src/test_info.cc.in
index 23336a9ff..788a7deba 100644
--- a/maxscale-system-test/maxtest/src/test_info.cc.in
+++ b/maxscale-system-test/maxtest/src/test_info.cc.in
@@ -1,4 +1,4 @@
-#include "test_info.hh"
+#include <maxtest/test_info.hh>
 
 const TestDefinition test_definitions_arr[] =
 {
diff --git a/maxscale-system-test/maxtest/src/testconnections.cc b/maxscale-system-test/maxtest/src/testconnections.cc
index 7627680b7..978807b1d 100644
--- a/maxscale-system-test/maxtest/src/testconnections.cc
+++ b/maxscale-system-test/maxtest/src/testconnections.cc
@@ -17,12 +17,12 @@
 #include <maxbase/stacktrace.hh>
 #include <algorithm>
 
-#include "mariadb_func.h"
+#include <maxtest/mariadb_func.h>
 #include "maxadmin_operations.h"
-#include "sql_t1.h"
-#include "testconnections.h"
-#include "test_info.hh"
-#include "envv.hh"
+#include <maxtest/sql_t1.h>
+#include <maxtest/testconnections.h>
+#include <maxtest/test_info.hh>
+#include <maxtest/envv.hh>
 
 using namespace mxb;
 using std::cout;