diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt
index 7686d4f2f..f1544a890 100644
--- a/maxscale-system-test/CMakeLists.txt
+++ b/maxscale-system-test/CMakeLists.txt
@@ -19,13 +19,8 @@ set(TEST_DEFINITIONS "" CACHE INTERNAL "")
 include(utilities.cmake)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/connectors/cdc-connector)
-
-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(${CMAKE_SOURCE_DIR}/connectors/cdc-connector)
 include_directories(maxtest/include)
 
 # Tool used to check backend state
diff --git a/maxscale-system-test/alter_router.cpp b/maxscale-system-test/alter_router.cpp
index 6dde1f48d..0da92dd8e 100644
--- a/maxscale-system-test/alter_router.cpp
+++ b/maxscale-system-test/alter_router.cpp
@@ -2,7 +2,7 @@
  * Test runtime modification of router options
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <iostream>
 #include <functional>
diff --git a/maxscale-system-test/avro_alter.cpp b/maxscale-system-test/avro_alter.cpp
index e8e9e1c51..13edd5126 100644
--- a/maxscale-system-test/avro_alter.cpp
+++ b/maxscale-system-test/avro_alter.cpp
@@ -2,7 +2,7 @@
  * @file avro_alter.cpp Test ALTER TABLE handling of avrorouter
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <jansson.h>
 #include <sstream>
 #include <iostream>
diff --git a/maxscale-system-test/backend_auth_fail.cpp b/maxscale-system-test/backend_auth_fail.cpp
index 06db352f0..5316b9669 100644
--- a/maxscale-system-test/backend_auth_fail.cpp
+++ b/maxscale-system-test/backend_auth_fail.cpp
@@ -4,7 +4,7 @@
  * MaxScale should not crash
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/binary_ps.cpp b/maxscale-system-test/binary_ps.cpp
index bd513263e..ae00d5efc 100644
--- a/maxscale-system-test/binary_ps.cpp
+++ b/maxscale-system-test/binary_ps.cpp
@@ -1,7 +1,7 @@
 /**
  * Test binary protocol prepared statement routing
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/binary_ps_cursor.cpp b/maxscale-system-test/binary_ps_cursor.cpp
index 9f648c970..7bf0f6501 100644
--- a/maxscale-system-test/binary_ps_cursor.cpp
+++ b/maxscale-system-test/binary_ps_cursor.cpp
@@ -1,7 +1,7 @@
 /**
  * Test that binary protocol cursors work as expected
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 
 using std::cout;
diff --git a/maxscale-system-test/binlog_change_master.cpp b/maxscale-system-test/binlog_change_master.cpp
index c8e099608..74fff5589 100644
--- a/maxscale-system-test/binlog_change_master.cpp
+++ b/maxscale-system-test/binlog_change_master.cpp
@@ -11,7 +11,7 @@
  * - check data on all nodes
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "binlog_change_master_common.cpp"
 
 int main(int argc, char* argv[])
diff --git a/maxscale-system-test/binlog_change_master_common.cpp b/maxscale-system-test/binlog_change_master_common.cpp
index 7ffbdd3c8..62ed3c023 100644
--- a/maxscale-system-test/binlog_change_master_common.cpp
+++ b/maxscale-system-test/binlog_change_master_common.cpp
@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 
 void run_test(TestConnections& test, std::function<void(MYSQL*)> cb)
diff --git a/maxscale-system-test/binlog_change_master_gtid.cpp b/maxscale-system-test/binlog_change_master_gtid.cpp
index cfeddb0a5..3ced0a804 100644
--- a/maxscale-system-test/binlog_change_master_gtid.cpp
+++ b/maxscale-system-test/binlog_change_master_gtid.cpp
@@ -2,7 +2,7 @@
  * The GTID version of binlog_change_master
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "binlog_change_master_common.cpp"
 
 int main(int argc, char* argv[])
diff --git a/maxscale-system-test/binlog_incompl.cpp b/maxscale-system-test/binlog_incompl.cpp
index 93259bbad..2b4daec4e 100644
--- a/maxscale-system-test/binlog_incompl.cpp
+++ b/maxscale-system-test/binlog_incompl.cpp
@@ -5,9 +5,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug143.cpp b/maxscale-system-test/bug143.cpp
index 3c1dadc4f..55ba22bd9 100644
--- a/maxscale-system-test/bug143.cpp
+++ b/maxscale-system-test/bug143.cpp
@@ -5,7 +5,7 @@
  * - try to connect using RWSplit. First and third are expected to fail, second should succeed.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug471.cpp b/maxscale-system-test/bug471.cpp
index 6ab91929f..19b234880 100644
--- a/maxscale-system-test/bug471.cpp
+++ b/maxscale-system-test/bug471.cpp
@@ -145,7 +145,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug473.cpp b/maxscale-system-test/bug473.cpp
index 93ce4ac02..02d7955ab 100644
--- a/maxscale-system-test/bug473.cpp
+++ b/maxscale-system-test/bug473.cpp
@@ -50,7 +50,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug475.cpp b/maxscale-system-test/bug475.cpp
index 4736029ee..39861b3c4 100644
--- a/maxscale-system-test/bug475.cpp
+++ b/maxscale-system-test/bug475.cpp
@@ -30,7 +30,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug519.cpp b/maxscale-system-test/bug519.cpp
index 58ed87015..03ceded9c 100644
--- a/maxscale-system-test/bug519.cpp
+++ b/maxscale-system-test/bug519.cpp
@@ -67,8 +67,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug529.cpp b/maxscale-system-test/bug529.cpp
index 254f5c50c..1c77458a2 100644
--- a/maxscale-system-test/bug529.cpp
+++ b/maxscale-system-test/bug529.cpp
@@ -126,8 +126,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug547.cpp b/maxscale-system-test/bug547.cpp
index 427048d37..9c60e86b1 100644
--- a/maxscale-system-test/bug547.cpp
+++ b/maxscale-system-test/bug547.cpp
@@ -18,7 +18,7 @@
 // also relates to bug594
 // all slaves in MaxScale config have wrong IP
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug565.cpp b/maxscale-system-test/bug565.cpp
index b3bb81382..23001766c 100644
--- a/maxscale-system-test/bug565.cpp
+++ b/maxscale-system-test/bug565.cpp
@@ -53,7 +53,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug571.cpp b/maxscale-system-test/bug571.cpp
index 5be64e7e3..d218e9f21 100644
--- a/maxscale-system-test/bug571.cpp
+++ b/maxscale-system-test/bug571.cpp
@@ -115,7 +115,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug572.cpp b/maxscale-system-test/bug572.cpp
index b77fd0dd0..2d02389ed 100644
--- a/maxscale-system-test/bug572.cpp
+++ b/maxscale-system-test/bug572.cpp
@@ -13,7 +13,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug587.cpp b/maxscale-system-test/bug587.cpp
index b215be3cd..f10829fd0 100644
--- a/maxscale-system-test/bug587.cpp
+++ b/maxscale-system-test/bug587.cpp
@@ -65,7 +65,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug592.cpp b/maxscale-system-test/bug592.cpp
index fd4d57318..726ba81bf 100644
--- a/maxscale-system-test/bug592.cpp
+++ b/maxscale-system-test/bug592.cpp
@@ -87,7 +87,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug601.cpp b/maxscale-system-test/bug601.cpp
index c0a23a11c..f37e5861f 100644
--- a/maxscale-system-test/bug601.cpp
+++ b/maxscale-system-test/bug601.cpp
@@ -46,7 +46,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug620.cpp b/maxscale-system-test/bug620.cpp
index 99864631e..0b443a76e 100644
--- a/maxscale-system-test/bug620.cpp
+++ b/maxscale-system-test/bug620.cpp
@@ -235,7 +235,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/bug626.cpp b/maxscale-system-test/bug626.cpp
index de1422a1b..ad92438b6 100644
--- a/maxscale-system-test/bug626.cpp
+++ b/maxscale-system-test/bug626.cpp
@@ -2,7 +2,7 @@
  * Check that old-style passwords are detected
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug653.cpp b/maxscale-system-test/bug653.cpp
index 688f1a6fb..b8ccbe709 100644
--- a/maxscale-system-test/bug653.cpp
+++ b/maxscale-system-test/bug653.cpp
@@ -46,7 +46,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug654.cpp b/maxscale-system-test/bug654.cpp
index 0c022202c..15e26595e 100644
--- a/maxscale-system-test/bug654.cpp
+++ b/maxscale-system-test/bug654.cpp
@@ -57,8 +57,8 @@
  */
 
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug658.cpp b/maxscale-system-test/bug658.cpp
index cc77df4b9..298edeaba 100644
--- a/maxscale-system-test/bug658.cpp
+++ b/maxscale-system-test/bug658.cpp
@@ -23,7 +23,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug662.cpp b/maxscale-system-test/bug662.cpp
index ae7502739..919bd76b4 100644
--- a/maxscale-system-test/bug662.cpp
+++ b/maxscale-system-test/bug662.cpp
@@ -9,8 +9,8 @@
  * - Sleep and check if Maxscale is alive
  */
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug664.cpp b/maxscale-system-test/bug664.cpp
index 5de908644..23e5f8fa2 100644
--- a/maxscale-system-test/bug664.cpp
+++ b/maxscale-system-test/bug664.cpp
@@ -6,7 +6,7 @@
  * - An error should be logged about the failed branch session
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug673.cpp b/maxscale-system-test/bug673.cpp
index dd939d3ec..d2040d949 100644
--- a/maxscale-system-test/bug673.cpp
+++ b/maxscale-system-test/bug673.cpp
@@ -8,8 +8,8 @@
  * - Check that only new style object names in maxadmin commands are accepted
  */
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug705.cpp b/maxscale-system-test/bug705.cpp
index de1a0f17a..ad0435bfd 100644
--- a/maxscale-system-test/bug705.cpp
+++ b/maxscale-system-test/bug705.cpp
@@ -273,8 +273,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug729.cpp b/maxscale-system-test/bug729.cpp
index 68deed555..079b2f753 100644
--- a/maxscale-system-test/bug729.cpp
+++ b/maxscale-system-test/bug729.cpp
@@ -60,7 +60,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bug730.cpp b/maxscale-system-test/bug730.cpp
index 40e95e78d..636575e84 100644
--- a/maxscale-system-test/bug730.cpp
+++ b/maxscale-system-test/bug730.cpp
@@ -41,7 +41,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/bulk_insert.cpp b/maxscale-system-test/bulk_insert.cpp
index 9edf1562d..b4a68f13e 100644
--- a/maxscale-system-test/bulk_insert.cpp
+++ b/maxscale-system-test/bulk_insert.cpp
@@ -5,7 +5,7 @@
  * https://mariadb.com/kb/en/mariadb/bulk-insert-column-wise-binding/
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 static int show_mysql_error(MYSQL* mysql)
 {
diff --git a/maxscale-system-test/cache_runtime.cpp b/maxscale-system-test/cache_runtime.cpp
index 94caf4b69..1c4440a10 100644
--- a/maxscale-system-test/cache_runtime.cpp
+++ b/maxscale-system-test/cache_runtime.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/cache_runtime_ttl.cpp b/maxscale-system-test/cache_runtime_ttl.cpp
index 6da4f7a11..67ec85944 100644
--- a/maxscale-system-test/cache_runtime_ttl.cpp
+++ b/maxscale-system-test/cache_runtime_ttl.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/ccrfilter.cpp b/maxscale-system-test/ccrfilter.cpp
index 26e74fab7..c1635e5c7 100644
--- a/maxscale-system-test/ccrfilter.cpp
+++ b/maxscale-system-test/ccrfilter.cpp
@@ -23,7 +23,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 static int master_id;
 
diff --git a/maxscale-system-test/ccrfilter_global.cpp b/maxscale-system-test/ccrfilter_global.cpp
index 943c6796a..4f25871d0 100644
--- a/maxscale-system-test/ccrfilter_global.cpp
+++ b/maxscale-system-test/ccrfilter_global.cpp
@@ -2,7 +2,7 @@
  * Test global mode for the CCRFilter
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp b/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp
index be3191e25..d65b9eef5 100644
--- a/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp
+++ b/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp
@@ -2,7 +2,7 @@
  * @file cdc_connect.cpp Test the CDC protocol
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <cdc_connector.h>
 #include "cdc_result.h"
 #include <iostream>
diff --git a/maxscale-system-test/change_master.cpp b/maxscale-system-test/change_master.cpp
index 2252f68d9..a6cffd76a 100644
--- a/maxscale-system-test/change_master.cpp
+++ b/maxscale-system-test/change_master.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/change_master_during_session.cpp b/maxscale-system-test/change_master_during_session.cpp
index d24602617..8ef87bd86 100644
--- a/maxscale-system-test/change_master_during_session.cpp
+++ b/maxscale-system-test/change_master_during_session.cpp
@@ -7,8 +7,8 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/change_user.cpp b/maxscale-system-test/change_user.cpp
index 84df4c24f..92d2e5ec3 100644
--- a/maxscale-system-test/change_user.cpp
+++ b/maxscale-system-test/change_user.cpp
@@ -12,7 +12,7 @@
  * - try INSERT again expecting success (user should not be changed)
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void run_test(TestConnections& test, MYSQL* conn)
 {
diff --git a/maxscale-system-test/check_backend.cpp b/maxscale-system-test/check_backend.cpp
index 5ebca0257..217c83ad8 100644
--- a/maxscale-system-test/check_backend.cpp
+++ b/maxscale-system-test/check_backend.cpp
@@ -4,7 +4,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/maxscale-system-test/clustrix_mon.cpp b/maxscale-system-test/clustrix_mon.cpp
index f6efceb41..8b180db46 100644
--- a/maxscale-system-test/clustrix_mon.cpp
+++ b/maxscale-system-test/clustrix_mon.cpp
@@ -19,7 +19,7 @@
  * See Clustrix_nodes.h for details about configiration
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/compound_statement.cpp b/maxscale-system-test/compound_statement.cpp
index a9b2c0108..2d81bf91e 100644
--- a/maxscale-system-test/compound_statement.cpp
+++ b/maxscale-system-test/compound_statement.cpp
@@ -2,7 +2,7 @@
  * Test 10.1 compound statements
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/config_test.cpp b/maxscale-system-test/config_test.cpp
index 7d456642f..d68bad59e 100644
--- a/maxscale-system-test/config_test.cpp
+++ b/maxscale-system-test/config_test.cpp
@@ -5,7 +5,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::string;
 
diff --git a/maxscale-system-test/connect_to_nonexisting_db.cpp b/maxscale-system-test/connect_to_nonexisting_db.cpp
index a547ecd47..0ba193e82 100644
--- a/maxscale-system-test/connect_to_nonexisting_db.cpp
+++ b/maxscale-system-test/connect_to_nonexisting_db.cpp
@@ -2,8 +2,8 @@
  * @file connect_to_nonexisting_db.cpp Tries to connect to non existing DB, expects no crash
  */
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 bool try_connect(TestConnections& test)
 {
diff --git a/maxscale-system-test/connection_limit.cpp b/maxscale-system-test/connection_limit.cpp
index 6e6513c7e..0d6037e8e 100644
--- a/maxscale-system-test/connection_limit.cpp
+++ b/maxscale-system-test/connection_limit.cpp
@@ -6,7 +6,7 @@
  * - create max num of connections and check tha N+1 connection fails
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void check_with_wrong_pw(int router, int max_conn, TestConnections& test);
 void check_max_conn(int router, int max_conn, TestConnections& test);
diff --git a/maxscale-system-test/crash_on_bad_sescmd.cpp b/maxscale-system-test/crash_on_bad_sescmd.cpp
index 4ee88315d..28f5933c2 100644
--- a/maxscale-system-test/crash_on_bad_sescmd.cpp
+++ b/maxscale-system-test/crash_on_bad_sescmd.cpp
@@ -2,7 +2,7 @@
  * Double-close on bad session command result
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void run_test(TestConnections& test)
 {
diff --git a/maxscale-system-test/csmon_test.cpp b/maxscale-system-test/csmon_test.cpp
index 6560901cd..a227644e5 100644
--- a/maxscale-system-test/csmon_test.cpp
+++ b/maxscale-system-test/csmon_test.cpp
@@ -2,7 +2,7 @@
  * MXS-2146: Test case for csmon
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/encrypted_passwords.cpp b/maxscale-system-test/encrypted_passwords.cpp
index 52cc8c4db..48bdb15ae 100644
--- a/maxscale-system-test/encrypted_passwords.cpp
+++ b/maxscale-system-test/encrypted_passwords.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 /** Remove old keys and create a new one */
 int create_key(TestConnections* test)
diff --git a/maxscale-system-test/error_messages.cpp b/maxscale-system-test/error_messages.cpp
index 43f526d41..38dccbc31 100644
--- a/maxscale-system-test/error_messages.cpp
+++ b/maxscale-system-test/error_messages.cpp
@@ -6,7 +6,7 @@
  * - repeat for RWSplit, ReadConn
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <algorithm>
 
diff --git a/maxscale-system-test/fail_switch_rejoin_common.cpp b/maxscale-system-test/fail_switch_rejoin_common.cpp
index daa8a06bd..1157dce3b 100644
--- a/maxscale-system-test/fail_switch_rejoin_common.cpp
+++ b/maxscale-system-test/fail_switch_rejoin_common.cpp
@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int inserts = 0;
 bool interactive = false;
diff --git a/maxscale-system-test/false_monitor_state_change.cpp b/maxscale-system-test/false_monitor_state_change.cpp
index 9b00466e2..75b9dd4d7 100644
--- a/maxscale-system-test/false_monitor_state_change.cpp
+++ b/maxscale-system-test/false_monitor_state_change.cpp
@@ -2,7 +2,7 @@
  * Test false server state changes when manually clearing master bit
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/fwf.cpp b/maxscale-system-test/fwf.cpp
index 5f5267840..962f2ca10 100644
--- a/maxscale-system-test/fwf.cpp
+++ b/maxscale-system-test/fwf.cpp
@@ -18,10 +18,10 @@
 
 #include <iostream>
 #include <ctime>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/fwf2.cpp b/maxscale-system-test/fwf2.cpp
index e14b696fd..84f20b0f9 100644
--- a/maxscale-system-test/fwf2.cpp
+++ b/maxscale-system-test/fwf2.cpp
@@ -17,10 +17,10 @@
 
 #include <iostream>
 #include <ctime>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/fw_copy_rules.h>
 
 int read_and_execute_queries(TestConnections* Test, const char* filename, int expected)
 {
diff --git a/maxscale-system-test/fwf_actions.cpp b/maxscale-system-test/fwf_actions.cpp
index 8ff3f8d4b..50395f252 100644
--- a/maxscale-system-test/fwf_actions.cpp
+++ b/maxscale-system-test/fwf_actions.cpp
@@ -9,8 +9,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/fwf_com_ping.cpp b/maxscale-system-test/fwf_com_ping.cpp
index b5b3857c0..5f27fd1ac 100644
--- a/maxscale-system-test/fwf_com_ping.cpp
+++ b/maxscale-system-test/fwf_com_ping.cpp
@@ -4,8 +4,8 @@
  * Check that COM_PING is allowed with `action=allow`
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* rules = "rule test1 deny regex '.*'\n"
                     "users %@% match any rules test1\n";
diff --git a/maxscale-system-test/fwf_duplicate_rules.cpp b/maxscale-system-test/fwf_duplicate_rules.cpp
index 57a7dfa67..84bff4810 100644
--- a/maxscale-system-test/fwf_duplicate_rules.cpp
+++ b/maxscale-system-test/fwf_duplicate_rules.cpp
@@ -4,8 +4,8 @@
  * Check if duplicate rules are detected.
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* rules = "rule test1 deny no_where_clause\n"
                     "rule test1 deny columns a b c\n"
diff --git a/maxscale-system-test/fwf_logging.cpp b/maxscale-system-test/fwf_logging.cpp
index 46d92193f..2de78b8bd 100644
--- a/maxscale-system-test/fwf_logging.cpp
+++ b/maxscale-system-test/fwf_logging.cpp
@@ -7,8 +7,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/fwf_prepared_stmt.cpp b/maxscale-system-test/fwf_prepared_stmt.cpp
index 5c45f6292..6dc8e0f12 100644
--- a/maxscale-system-test/fwf_prepared_stmt.cpp
+++ b/maxscale-system-test/fwf_prepared_stmt.cpp
@@ -5,8 +5,8 @@
  * properly handled.
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* rules = "rule test1 deny columns c on_queries select\n"
                     "users %@% match any rules test1\n";
diff --git a/maxscale-system-test/fwf_reload.cpp b/maxscale-system-test/fwf_reload.cpp
index 5f39b1427..be14f8fea 100644
--- a/maxscale-system-test/fwf_reload.cpp
+++ b/maxscale-system-test/fwf_reload.cpp
@@ -5,10 +5,10 @@
 
 #include <iostream>
 #include <ctime>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/fwf_strict.cpp b/maxscale-system-test/fwf_strict.cpp
index bbaa0f49c..586c37258 100644
--- a/maxscale-system-test/fwf_strict.cpp
+++ b/maxscale-system-test/fwf_strict.cpp
@@ -4,8 +4,8 @@
  * Check that COM_PING is allowed with `action=allow`
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 #include <fstream>
 
diff --git a/maxscale-system-test/fwf_syntax.cpp b/maxscale-system-test/fwf_syntax.cpp
index f7b7c1ec6..04b160ad8 100644
--- a/maxscale-system-test/fwf_syntax.cpp
+++ b/maxscale-system-test/fwf_syntax.cpp
@@ -10,8 +10,8 @@
 #include <iostream>
 #include <unistd.h>
 #include <linux/limits.h>
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* temp_rules = "rules_tmp.txt";
 
diff --git a/maxscale-system-test/galera_priority.cpp b/maxscale-system-test/galera_priority.cpp
index 903849f98..653319750 100644
--- a/maxscale-system-test/galera_priority.cpp
+++ b/maxscale-system-test/galera_priority.cpp
@@ -13,7 +13,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/kerberos_setup.cpp b/maxscale-system-test/kerberos_setup.cpp
index 64b12bd25..8e6d8feb6 100644
--- a/maxscale-system-test/kerberos_setup.cpp
+++ b/maxscale-system-test/kerberos_setup.cpp
@@ -7,7 +7,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/kill_master.cpp b/maxscale-system-test/kill_master.cpp
index b1e54ad6f..12c07dd1f 100644
--- a/maxscale-system-test/kill_master.cpp
+++ b/maxscale-system-test/kill_master.cpp
@@ -9,7 +9,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/kill_query.cpp b/maxscale-system-test/kill_query.cpp
index c815033e2..280288ac6 100644
--- a/maxscale-system-test/kill_query.cpp
+++ b/maxscale-system-test/kill_query.cpp
@@ -2,7 +2,7 @@
  * Test KILL QUERY functionality
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/local_address.cpp b/maxscale-system-test/local_address.cpp
index 9c9684eaa..79af6cf98 100644
--- a/maxscale-system-test/local_address.cpp
+++ b/maxscale-system-test/local_address.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <algorithm>
 #include <iostream>
 #include <iterator>
diff --git a/maxscale-system-test/long_sysbench.cpp b/maxscale-system-test/long_sysbench.cpp
index c217e17c7..76ee5ff88 100644
--- a/maxscale-system-test/long_sysbench.cpp
+++ b/maxscale-system-test/long_sysbench.cpp
@@ -8,7 +8,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "sysbench_commands.h"
 
 int main(int argc, char* argv[])
diff --git a/maxscale-system-test/long_test.cpp b/maxscale-system-test/long_test.cpp
index 97447b13a..9f2b8272b 100644
--- a/maxscale-system-test/long_test.cpp
+++ b/maxscale-system-test/long_test.cpp
@@ -6,8 +6,8 @@
  */
 
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 typedef void * FUNC(void * ptr);
 
diff --git a/maxscale-system-test/lots_of_rows.cpp b/maxscale-system-test/lots_of_rows.cpp
index 6bf61c006..46914b4d6 100644
--- a/maxscale-system-test/lots_of_rows.cpp
+++ b/maxscale-system-test/lots_of_rows.cpp
@@ -6,8 +6,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp
index d1bab8b91..8db72098c 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp
@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::stringstream;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp
index 09a75ae5f..c019cea96 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <maxbase/format.hh>
 
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp
index 5a5ffe32d..52d83a1a6 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp
@@ -1,7 +1,7 @@
 /**
  * Test monitoring and failover with ignore_external_masters=true
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <atomic>
 #include <thread>
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp
index 888a0d3b1..56681e777 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "failover_common.cpp"
 #include <string>
 
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp
index c57c92a9c..5c2ce01cc 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp
index df695d695..1a2ce2c90 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "failover_common.cpp"
 
 int main(int argc, char** argv)
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp
index 076db054c..660e1826e 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <exception>
 #include <iostream>
 #include <sstream>
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp
index e56b1797a..92e9cd3fd 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp
@@ -13,7 +13,7 @@
 
 // MXS-2652: https://jira.mariadb.org/browse/MXS-2652
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 using std::string;
 
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp
index b9aa01190..2a7edb790 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp
index 240d77586..aa2ed02f0 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp
index 1c2bb4e5a..f8fee2d79 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp
index c769f48e5..6a0b7ca10 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp
index 0dd308002..47bfb142c 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp
@@ -18,7 +18,7 @@
 #include <thread>
 #include <vector>
 #include <random>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using namespace std;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp
index aecb2fe27..a1a97501e 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp
@@ -21,9 +21,9 @@
 #include <iostream>
 #include <string>
 #include <set>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
 #include <jansson.h>
 #include <maxbase/string.hh>
 
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp
index 7fca5cd9c..c6eee6ffd 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <vector>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::string;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp
index 0ec5f4c32..84303a8f9 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <iterator>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::string;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp
index 44433d67b..30283e311 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp
index 06de0e6f4..4e40b65cd 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp
index 349f89d1c..09ddbe591 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp
index c88b4520b..886af1dab 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp
index 96c87a4af..cf0e598d8 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp
@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;
diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp
index 9811cc94b..9ca6c1a60 100644
--- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp
+++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp
@@ -18,7 +18,7 @@
 #include <thread>
 #include <vector>
 #include <random>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using namespace std;
diff --git a/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp b/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp
index 56685f683..78d5641c4 100644
--- a/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp
+++ b/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp
@@ -4,7 +4,7 @@
  * Testing of master failure verification
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/masking_auto_firewall.cpp b/maxscale-system-test/masking_auto_firewall.cpp
index f7d8e0aac..4923188d1 100644
--- a/maxscale-system-test/masking_auto_firewall.cpp
+++ b/maxscale-system-test/masking_auto_firewall.cpp
@@ -12,7 +12,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/max_connections.cpp b/maxscale-system-test/max_connections.cpp
index 3f8a840e7..873ca37f8 100644
--- a/maxscale-system-test/max_connections.cpp
+++ b/maxscale-system-test/max_connections.cpp
@@ -7,7 +7,7 @@
  * - close all connections
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #define CONNECTIONS 21
 #define ITER        25
diff --git a/maxscale-system-test/maxctrl_basic.cpp b/maxscale-system-test/maxctrl_basic.cpp
index f109a2b7b..db86a1408 100644
--- a/maxscale-system-test/maxctrl_basic.cpp
+++ b/maxscale-system-test/maxctrl_basic.cpp
@@ -2,7 +2,7 @@
  * Minimal MaxCtrl sanity check
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/maxinfo_sql.cpp b/maxscale-system-test/maxinfo_sql.cpp
index 488b6ab6b..a63799f8a 100644
--- a/maxscale-system-test/maxinfo_sql.cpp
+++ b/maxscale-system-test/maxinfo_sql.cpp
@@ -2,7 +2,7 @@
  * Test MaxInfo with the SQL interface
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <string>
 #include <thread>
 #include <vector>
diff --git a/maxscale-system-test/maxscale_process_user.cpp b/maxscale-system-test/maxscale_process_user.cpp
index 246b36375..18f78d725 100644
--- a/maxscale-system-test/maxscale_process_user.cpp
+++ b/maxscale-system-test/maxscale_process_user.cpp
@@ -2,7 +2,7 @@
  * Check if Maxscale priocess is running as 'maxscale'
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/maxtest/src/maxadmin_operations.cc b/maxscale-system-test/maxtest/src/maxadmin_operations.cc
index 761b7655a..334f1d698 100644
--- a/maxscale-system-test/maxtest/src/maxadmin_operations.cc
+++ b/maxscale-system-test/maxtest/src/maxadmin_operations.cc
@@ -16,7 +16,7 @@
  * Copyright MariaDB Corporation Ab 2014
  */
 
-#include "maxadmin_operations.h"
+#include <maxtest/maxadmin_operations.h>
 
 int connectMaxScale(char* hostname, char* port)
 {
diff --git a/maxscale-system-test/maxtest/src/testconnections.cc b/maxscale-system-test/maxtest/src/testconnections.cc
index 978807b1d..ad232bf28 100644
--- a/maxscale-system-test/maxtest/src/testconnections.cc
+++ b/maxscale-system-test/maxtest/src/testconnections.cc
@@ -18,7 +18,7 @@
 #include <algorithm>
 
 #include <maxtest/mariadb_func.h>
-#include "maxadmin_operations.h"
+#include <maxtest/maxadmin_operations.h>
 #include <maxtest/sql_t1.h>
 #include <maxtest/testconnections.h>
 #include <maxtest/test_info.hh>
diff --git a/maxscale-system-test/mm.cpp b/maxscale-system-test/mm.cpp
index 0db99df29..9ecee4102 100644
--- a/maxscale-system-test/mm.cpp
+++ b/maxscale-system-test/mm.cpp
@@ -22,9 +22,9 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
 
 int check_conf(TestConnections& test, int blocked_node)
 {
diff --git a/maxscale-system-test/mxs1045.cpp b/maxscale-system-test/mxs1045.cpp
index 66d79b89c..520419b3b 100644
--- a/maxscale-system-test/mxs1045.cpp
+++ b/maxscale-system-test/mxs1045.cpp
@@ -11,7 +11,7 @@
  * - Check that script execution doesn't leave zombie processes
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1113_schemarouter_ps.cpp b/maxscale-system-test/mxs1113_schemarouter_ps.cpp
index 695e45bdd..0b7c3747a 100644
--- a/maxscale-system-test/mxs1113_schemarouter_ps.cpp
+++ b/maxscale-system-test/mxs1113_schemarouter_ps.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1113
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 
 void test_text_protocol(TestConnections& test, MYSQL* conn)
diff --git a/maxscale-system-test/mxs1123.cpp b/maxscale-system-test/mxs1123.cpp
index 4702811ad..8ca0a3740 100644
--- a/maxscale-system-test/mxs1123.cpp
+++ b/maxscale-system-test/mxs1123.cpp
@@ -2,7 +2,7 @@
  * MXS-1123: connect_timeout setting causes frequent disconnects
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs118.cpp b/maxscale-system-test/mxs118.cpp
index e992c3490..8b29e7517 100644
--- a/maxscale-system-test/mxs118.cpp
+++ b/maxscale-system-test/mxs118.cpp
@@ -9,7 +9,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs1295_sp_call.cpp b/maxscale-system-test/mxs1295_sp_call.cpp
index 0515bf1c3..1d3f39095 100644
--- a/maxscale-system-test/mxs1295_sp_call.cpp
+++ b/maxscale-system-test/mxs1295_sp_call.cpp
@@ -1,7 +1,7 @@
 /**
  * Test for MXS-1295: https://jira.mariadb.org/browse/MXS-1295
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 const char sp_sql[] =
     "DROP PROCEDURE IF EXISTS multi;"
diff --git a/maxscale-system-test/mxs1310_implicit_db.cpp b/maxscale-system-test/mxs1310_implicit_db.cpp
index ce6474c8a..bff727716 100644
--- a/maxscale-system-test/mxs1310_implicit_db.cpp
+++ b/maxscale-system-test/mxs1310_implicit_db.cpp
@@ -5,7 +5,7 @@
  * - Mix of explicit and implicit databases -> shard containing current database
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1319.cpp b/maxscale-system-test/mxs1319.cpp
index 438b4e348..da4083189 100644
--- a/maxscale-system-test/mxs1319.cpp
+++ b/maxscale-system-test/mxs1319.cpp
@@ -2,7 +2,7 @@
  * Check that SQL_MODE='PAD_CHAR_TO_FULL_LENGTH' doesn't break authentication
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1323_retry_read.cpp b/maxscale-system-test/mxs1323_retry_read.cpp
index 0e8a70247..f284eec28 100644
--- a/maxscale-system-test/mxs1323_retry_read.cpp
+++ b/maxscale-system-test/mxs1323_retry_read.cpp
@@ -3,7 +3,7 @@
  * - Check that retried reads work with persistent connections
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void* async_block(void* data)
 {
diff --git a/maxscale-system-test/mxs1323_stress.cpp b/maxscale-system-test/mxs1323_stress.cpp
index 52232b9a7..28af6d606 100644
--- a/maxscale-system-test/mxs1323_stress.cpp
+++ b/maxscale-system-test/mxs1323_stress.cpp
@@ -3,7 +3,7 @@
  * - Check that retried reads work with persistent connections
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <sstream>
 
 static bool running = true;
diff --git a/maxscale-system-test/mxs1418.cpp b/maxscale-system-test/mxs1418.cpp
index 2f44d34d6..921a1abaa 100644
--- a/maxscale-system-test/mxs1418.cpp
+++ b/maxscale-system-test/mxs1418.cpp
@@ -2,7 +2,7 @@
  * @file Check that removing a server from a service doesn't break active connections
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 static volatile bool running = true;
 
diff --git a/maxscale-system-test/mxs1451_skip_auth.cpp b/maxscale-system-test/mxs1451_skip_auth.cpp
index bc9afb8c1..b3c226ae5 100644
--- a/maxscale-system-test/mxs1451_skip_auth.cpp
+++ b/maxscale-system-test/mxs1451_skip_auth.cpp
@@ -4,7 +4,7 @@
  * Check that connection through MaxScale work even if authentication is disabled
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1457_ignore_deleted.cpp b/maxscale-system-test/mxs1457_ignore_deleted.cpp
index 1a8293763..89d619599 100644
--- a/maxscale-system-test/mxs1457_ignore_deleted.cpp
+++ b/maxscale-system-test/mxs1457_ignore_deleted.cpp
@@ -4,7 +4,7 @@
  * Check that a corrupt and deleted server is not used to load users
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1468.cpp b/maxscale-system-test/mxs1468.cpp
index 7c82ea358..b1ba5854d 100644
--- a/maxscale-system-test/mxs1468.cpp
+++ b/maxscale-system-test/mxs1468.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1468
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1476.cpp b/maxscale-system-test/mxs1476.cpp
index a94467c7b..6a576de7c 100644
--- a/maxscale-system-test/mxs1476.cpp
+++ b/maxscale-system-test/mxs1476.cpp
@@ -5,7 +5,7 @@
  * https://jira.mariadb.org/browse/MXS-1476
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void list_servers(TestConnections& test)
 {
diff --git a/maxscale-system-test/mxs1503_extra_slaves.cpp b/maxscale-system-test/mxs1503_extra_slaves.cpp
index a3e4c4f8c..fa4967e92 100644
--- a/maxscale-system-test/mxs1503_extra_slaves.cpp
+++ b/maxscale-system-test/mxs1503_extra_slaves.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1503
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <thread>
 #include <iostream>
diff --git a/maxscale-system-test/mxs1503_master_reconnection.cpp b/maxscale-system-test/mxs1503_master_reconnection.cpp
index 4ff9793f5..f296ddf3f 100644
--- a/maxscale-system-test/mxs1503_master_reconnection.cpp
+++ b/maxscale-system-test/mxs1503_master_reconnection.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1503
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <iostream>
 #include <functional>
diff --git a/maxscale-system-test/mxs1503_queued_sescmd.cpp b/maxscale-system-test/mxs1503_queued_sescmd.cpp
index 37887926a..8cd89ddfa 100644
--- a/maxscale-system-test/mxs1503_queued_sescmd.cpp
+++ b/maxscale-system-test/mxs1503_queued_sescmd.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1503
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <iostream>
 #include <functional>
diff --git a/maxscale-system-test/mxs1506_delayed_retry.cpp b/maxscale-system-test/mxs1506_delayed_retry.cpp
index ea6c060c5..c43f81d02 100644
--- a/maxscale-system-test/mxs1506_delayed_retry.cpp
+++ b/maxscale-system-test/mxs1506_delayed_retry.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1506
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 #include <thread>
 #include <iostream>
diff --git a/maxscale-system-test/mxs1506_no_master.cpp b/maxscale-system-test/mxs1506_no_master.cpp
index c9b9d9f35..d8b2fec07 100644
--- a/maxscale-system-test/mxs1506_no_master.cpp
+++ b/maxscale-system-test/mxs1506_no_master.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1506
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <string>
 #include <functional>
 #include <thread>
diff --git a/maxscale-system-test/mxs1507_inconsistent_trx.cpp b/maxscale-system-test/mxs1507_inconsistent_trx.cpp
index 1223ab08a..81e2044dd 100644
--- a/maxscale-system-test/mxs1507_inconsistent_trx.cpp
+++ b/maxscale-system-test/mxs1507_inconsistent_trx.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1507
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 #include <iostream>
 #include <vector>
diff --git a/maxscale-system-test/mxs1507_migrate_trx.cpp b/maxscale-system-test/mxs1507_migrate_trx.cpp
index c05aee2d5..3add93b67 100644
--- a/maxscale-system-test/mxs1507_migrate_trx.cpp
+++ b/maxscale-system-test/mxs1507_migrate_trx.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1507
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 #include <iostream>
 #include <vector>
diff --git a/maxscale-system-test/mxs1507_trx_replay.cpp b/maxscale-system-test/mxs1507_trx_replay.cpp
index 2b5982e6e..013bc5f7f 100644
--- a/maxscale-system-test/mxs1507_trx_replay.cpp
+++ b/maxscale-system-test/mxs1507_trx_replay.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1507
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 #include <iostream>
 #include <vector>
diff --git a/maxscale-system-test/mxs1507_trx_stress.cpp b/maxscale-system-test/mxs1507_trx_stress.cpp
index b6ac95771..120f11fbf 100644
--- a/maxscale-system-test/mxs1507_trx_stress.cpp
+++ b/maxscale-system-test/mxs1507_trx_stress.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1507
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <vector>
 #include <thread>
diff --git a/maxscale-system-test/mxs1509.cpp b/maxscale-system-test/mxs1509.cpp
index c9198c10e..580dd0df9 100644
--- a/maxscale-system-test/mxs1509.cpp
+++ b/maxscale-system-test/mxs1509.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1509
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <sstream>
 
 void change_master(TestConnections& test, int slave, int master, const char* name = NULL)
diff --git a/maxscale-system-test/mxs1516.cpp b/maxscale-system-test/mxs1516.cpp
index 2be6db2ac..1929d26fd 100644
--- a/maxscale-system-test/mxs1516.cpp
+++ b/maxscale-system-test/mxs1516.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1516
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1542.cpp b/maxscale-system-test/mxs1542.cpp
index ffc2b54af..05b2868bf 100644
--- a/maxscale-system-test/mxs1542.cpp
+++ b/maxscale-system-test/mxs1542.cpp
@@ -4,7 +4,7 @@
  * Check that UTF16 strings work.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1543.cpp b/maxscale-system-test/mxs1543.cpp
index 195a5af71..de882138c 100644
--- a/maxscale-system-test/mxs1543.cpp
+++ b/maxscale-system-test/mxs1543.cpp
@@ -4,7 +4,7 @@
  * Avrorouter doesn't detect MIXED or STATEMENT format replication
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1549_optimistic_trx.cpp b/maxscale-system-test/mxs1549_optimistic_trx.cpp
index 6ce161ab1..a3f296ae8 100644
--- a/maxscale-system-test/mxs1549_optimistic_trx.cpp
+++ b/maxscale-system-test/mxs1549_optimistic_trx.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1549
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 #include <iostream>
 #include <vector>
diff --git a/maxscale-system-test/mxs1583_fwf.cpp b/maxscale-system-test/mxs1583_fwf.cpp
index b588c4b75..c7c373fa9 100644
--- a/maxscale-system-test/mxs1583_fwf.cpp
+++ b/maxscale-system-test/mxs1583_fwf.cpp
@@ -7,8 +7,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1585.cpp b/maxscale-system-test/mxs1585.cpp
index dc78293fa..9f6121750 100644
--- a/maxscale-system-test/mxs1585.cpp
+++ b/maxscale-system-test/mxs1585.cpp
@@ -5,7 +5,7 @@
  * mode when master_failure_mode is fail_on_write.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 
 static bool running = true;
diff --git a/maxscale-system-test/mxs1643_extra_events.cpp b/maxscale-system-test/mxs1643_extra_events.cpp
index 886789d97..c0128ac53 100644
--- a/maxscale-system-test/mxs1643_extra_events.cpp
+++ b/maxscale-system-test/mxs1643_extra_events.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1643
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1653_ps_hang.cpp b/maxscale-system-test/mxs1653_ps_hang.cpp
index 6bfaa66b0..1b3782407 100644
--- a/maxscale-system-test/mxs1653_ps_hang.cpp
+++ b/maxscale-system-test/mxs1653_ps_hang.cpp
@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1662_pam_admin.cpp b/maxscale-system-test/mxs1662_pam_admin.cpp
index 920251b56..25a835440 100644
--- a/maxscale-system-test/mxs1662_pam_admin.cpp
+++ b/maxscale-system-test/mxs1662_pam_admin.cpp
@@ -2,7 +2,7 @@
  * MXS-1662: PAM authenticator for admin users
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1677_temp_table.cpp b/maxscale-system-test/mxs1677_temp_table.cpp
index 7c942759c..60d47a537 100644
--- a/maxscale-system-test/mxs1677_temp_table.cpp
+++ b/maxscale-system-test/mxs1677_temp_table.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1677
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1678_relay_master.cpp b/maxscale-system-test/mxs1678_relay_master.cpp
index cc255120b..aa23d5bb9 100644
--- a/maxscale-system-test/mxs1678_relay_master.cpp
+++ b/maxscale-system-test/mxs1678_relay_master.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1678
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <set>
 #include <string>
 
diff --git a/maxscale-system-test/mxs1713_lots_of_databases.cpp b/maxscale-system-test/mxs1713_lots_of_databases.cpp
index 52faeff23..eb1806a5d 100644
--- a/maxscale-system-test/mxs1713_lots_of_databases.cpp
+++ b/maxscale-system-test/mxs1713_lots_of_databases.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1713
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <set>
 #include <numeric>
diff --git a/maxscale-system-test/mxs1719.cpp b/maxscale-system-test/mxs1719.cpp
index b62255865..88ce9ba88 100644
--- a/maxscale-system-test/mxs1719.cpp
+++ b/maxscale-system-test/mxs1719.cpp
@@ -12,7 +12,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs1731_old_persisted_config.cpp b/maxscale-system-test/mxs1731_old_persisted_config.cpp
index 9e049179c..0f1337193 100644
--- a/maxscale-system-test/mxs1731_old_persisted_config.cpp
+++ b/maxscale-system-test/mxs1731_old_persisted_config.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1731
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <fstream>
 #include <iostream>
 
diff --git a/maxscale-system-test/mxs1743_rconn_bitmask.cpp b/maxscale-system-test/mxs1743_rconn_bitmask.cpp
index 3784b9624..a85a06216 100644
--- a/maxscale-system-test/mxs1743_rconn_bitmask.cpp
+++ b/maxscale-system-test/mxs1743_rconn_bitmask.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1743
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 
 int main(int argc, char** argv)
diff --git a/maxscale-system-test/mxs1751_available_when_donor_crash.cpp b/maxscale-system-test/mxs1751_available_when_donor_crash.cpp
index e63f584fc..017736940 100644
--- a/maxscale-system-test/mxs1751_available_when_donor_crash.cpp
+++ b/maxscale-system-test/mxs1751_available_when_donor_crash.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1760_use_sql_variables_in.cpp b/maxscale-system-test/mxs1760_use_sql_variables_in.cpp
index 8aad49cd4..7474f9c78 100644
--- a/maxscale-system-test/mxs1760_use_sql_variables_in.cpp
+++ b/maxscale-system-test/mxs1760_use_sql_variables_in.cpp
@@ -5,7 +5,7 @@
  * https://jira.mariadb.org/browse/MXS-1760
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <iostream>
 
diff --git a/maxscale-system-test/mxs1773_failing_ldli.cpp b/maxscale-system-test/mxs1773_failing_ldli.cpp
index f8e113608..e394f7e0e 100644
--- a/maxscale-system-test/mxs1773_failing_ldli.cpp
+++ b/maxscale-system-test/mxs1773_failing_ldli.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1773
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 
 int main(int argc, char** argv)
diff --git a/maxscale-system-test/mxs1776_ps_exec_hang.cpp b/maxscale-system-test/mxs1776_ps_exec_hang.cpp
index 5dabb3cdf..71123f1eb 100644
--- a/maxscale-system-test/mxs1776_ps_exec_hang.cpp
+++ b/maxscale-system-test/mxs1776_ps_exec_hang.cpp
@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <functional>
 #include <vector>
diff --git a/maxscale-system-test/mxs1778_causal_reads.cpp b/maxscale-system-test/mxs1778_causal_reads.cpp
index 2099db031..7a7fe6109 100644
--- a/maxscale-system-test/mxs1778_causal_reads.cpp
+++ b/maxscale-system-test/mxs1778_causal_reads.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1778
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 static std::string master;
 
diff --git a/maxscale-system-test/mxs1787_call_ps.cpp b/maxscale-system-test/mxs1787_call_ps.cpp
index 6028f455c..7c16c03ee 100644
--- a/maxscale-system-test/mxs1787_call_ps.cpp
+++ b/maxscale-system-test/mxs1787_call_ps.cpp
@@ -2,7 +2,7 @@
  * MXS-1787: Crash with PS: CALL p1((SELECT f1()), ?)
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs1787_slave_reconnection.cpp b/maxscale-system-test/mxs1787_slave_reconnection.cpp
index e2f3d75a5..7bfeaeab4 100644
--- a/maxscale-system-test/mxs1787_slave_reconnection.cpp
+++ b/maxscale-system-test/mxs1787_slave_reconnection.cpp
@@ -5,7 +5,7 @@
  * readwritesplit slave reconnection and execution of session commands.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs1804_long_ps_hang.cpp b/maxscale-system-test/mxs1804_long_ps_hang.cpp
index a2bbdbcca..ddab67f68 100644
--- a/maxscale-system-test/mxs1804_long_ps_hang.cpp
+++ b/maxscale-system-test/mxs1804_long_ps_hang.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1804
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int sql_str_size(int sqlsize)
 {
diff --git a/maxscale-system-test/mxs1808_long_data.cpp b/maxscale-system-test/mxs1808_long_data.cpp
index 8f56b5e8f..73e9d0d7d 100644
--- a/maxscale-system-test/mxs1808_long_data.cpp
+++ b/maxscale-system-test/mxs1808_long_data.cpp
@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 
 using namespace std;
diff --git a/maxscale-system-test/mxs1824_double_cursor.cpp b/maxscale-system-test/mxs1824_double_cursor.cpp
index 05e30bad9..757c082ae 100644
--- a/maxscale-system-test/mxs1824_double_cursor.cpp
+++ b/maxscale-system-test/mxs1824_double_cursor.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1824
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void double_cursor(TestConnections& test, MYSQL* conn)
 {
diff --git a/maxscale-system-test/mxs1828_double_local_infile.cpp b/maxscale-system-test/mxs1828_double_local_infile.cpp
index 6c6d6c6b6..6ce93e7dd 100644
--- a/maxscale-system-test/mxs1828_double_local_infile.cpp
+++ b/maxscale-system-test/mxs1828_double_local_infile.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1828
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <fstream>
 
 using namespace std;
diff --git a/maxscale-system-test/mxs1831_unknown_param.cpp b/maxscale-system-test/mxs1831_unknown_param.cpp
index 2e99ee070..d233ceb11 100644
--- a/maxscale-system-test/mxs1831_unknown_param.cpp
+++ b/maxscale-system-test/mxs1831_unknown_param.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1831
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1836_show_eventTimes.cpp b/maxscale-system-test/mxs1836_show_eventTimes.cpp
index 274c815cc..dc7bd423a 100644
--- a/maxscale-system-test/mxs1836_show_eventTimes.cpp
+++ b/maxscale-system-test/mxs1836_show_eventTimes.cpp
@@ -12,7 +12,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs1849_table_sharding.cpp b/maxscale-system-test/mxs1849_table_sharding.cpp
index c0abf4b70..bfe50bad2 100644
--- a/maxscale-system-test/mxs1849_table_sharding.cpp
+++ b/maxscale-system-test/mxs1849_table_sharding.cpp
@@ -6,7 +6,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1873_large_sescmd.cpp b/maxscale-system-test/mxs1873_large_sescmd.cpp
index bd6285919..678db5521 100644
--- a/maxscale-system-test/mxs1873_large_sescmd.cpp
+++ b/maxscale-system-test/mxs1873_large_sescmd.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1873
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1889.cpp b/maxscale-system-test/mxs1889.cpp
index 18f513aa6..83cfb1eeb 100644
--- a/maxscale-system-test/mxs1889.cpp
+++ b/maxscale-system-test/mxs1889.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1889
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <string>
 
diff --git a/maxscale-system-test/mxs1896_load_data_infile.cpp b/maxscale-system-test/mxs1896_load_data_infile.cpp
index 31bf863b5..520175f0a 100644
--- a/maxscale-system-test/mxs1896_load_data_infile.cpp
+++ b/maxscale-system-test/mxs1896_load_data_infile.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1896
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1899_generated_cnf.cpp b/maxscale-system-test/mxs1899_generated_cnf.cpp
index 170d972a8..7952cb56a 100644
--- a/maxscale-system-test/mxs1899_generated_cnf.cpp
+++ b/maxscale-system-test/mxs1899_generated_cnf.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1899
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1926_killed_server.cpp b/maxscale-system-test/mxs1926_killed_server.cpp
index 051f00937..0b6193a78 100644
--- a/maxscale-system-test/mxs1926_killed_server.cpp
+++ b/maxscale-system-test/mxs1926_killed_server.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1926
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <stdlib.h>
 #include <thread>
 #include <fstream>
diff --git a/maxscale-system-test/mxs1929_filter_runtime.cpp b/maxscale-system-test/mxs1929_filter_runtime.cpp
index d9fc38d7a..11d71b2b4 100644
--- a/maxscale-system-test/mxs1929_filter_runtime.cpp
+++ b/maxscale-system-test/mxs1929_filter_runtime.cpp
@@ -2,7 +2,7 @@
  * MXS-1929: Runtime filter creation
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <iostream>
 #include <thread>
diff --git a/maxscale-system-test/mxs1929_service_runtime.cpp b/maxscale-system-test/mxs1929_service_runtime.cpp
index 62d4ce1ae..99476f3fe 100644
--- a/maxscale-system-test/mxs1929_service_runtime.cpp
+++ b/maxscale-system-test/mxs1929_service_runtime.cpp
@@ -1,7 +1,7 @@
 /**
  * MXS-1929: Runtime service creation
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <iostream>
 #include <thread>
diff --git a/maxscale-system-test/mxs1929_start_from_scratch.cpp b/maxscale-system-test/mxs1929_start_from_scratch.cpp
index 6fcbe4079..9d5de5273 100644
--- a/maxscale-system-test/mxs1929_start_from_scratch.cpp
+++ b/maxscale-system-test/mxs1929_start_from_scratch.cpp
@@ -3,7 +3,7 @@
  * repeated multiple times
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <atomic>
 #include <chrono>
diff --git a/maxscale-system-test/mxs1932_hidden_cnf.cpp b/maxscale-system-test/mxs1932_hidden_cnf.cpp
index ad1879134..aed35bdd3 100644
--- a/maxscale-system-test/mxs1932_hidden_cnf.cpp
+++ b/maxscale-system-test/mxs1932_hidden_cnf.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1932
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <fstream>
 #include <iostream>
diff --git a/maxscale-system-test/mxs1947_composite_roles.cpp b/maxscale-system-test/mxs1947_composite_roles.cpp
index 9272e9434..7d7f0aa4b 100644
--- a/maxscale-system-test/mxs1947_composite_roles.cpp
+++ b/maxscale-system-test/mxs1947_composite_roles.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-1947
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1949_warn_user_injection.cpp b/maxscale-system-test/mxs1949_warn_user_injection.cpp
index 1d9fcb954..a3b3f3439 100644
--- a/maxscale-system-test/mxs1949_warn_user_injection.cpp
+++ b/maxscale-system-test/mxs1949_warn_user_injection.cpp
@@ -5,7 +5,7 @@
  * 'inject_service_user' is enabled.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs1958_insert_priv.cpp b/maxscale-system-test/mxs1958_insert_priv.cpp
index 0c5c87962..507a0f437 100644
--- a/maxscale-system-test/mxs1958_insert_priv.cpp
+++ b/maxscale-system-test/mxs1958_insert_priv.cpp
@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs1961_standalone_rejoin.cpp b/maxscale-system-test/mxs1961_standalone_rejoin.cpp
index 352c1c76a..908952690 100644
--- a/maxscale-system-test/mxs1961_standalone_rejoin.cpp
+++ b/maxscale-system-test/mxs1961_standalone_rejoin.cpp
@@ -2,7 +2,7 @@
  * MXS-1961: Standalone master loses master status
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <maxbase/assert.h>
 
diff --git a/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp b/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp
index 2f8898a4a..9b202b51c 100644
--- a/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp
+++ b/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <maxbase/assert.h>
 #include <maxbase/log.hh>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs1985_kill_hang.cpp b/maxscale-system-test/mxs1985_kill_hang.cpp
index d255bdb9c..602e454b3 100644
--- a/maxscale-system-test/mxs1985_kill_hang.cpp
+++ b/maxscale-system-test/mxs1985_kill_hang.cpp
@@ -2,7 +2,7 @@
  * MXS-1985: MaxScale hangs on concurrent KILL processing
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <atomic>
 #include <thread>
diff --git a/maxscale-system-test/mxs2037_namedserver_wildcards.cpp b/maxscale-system-test/mxs2037_namedserver_wildcards.cpp
index 2f73280fb..e63fcea75 100644
--- a/maxscale-system-test/mxs2037_namedserver_wildcards.cpp
+++ b/maxscale-system-test/mxs2037_namedserver_wildcards.cpp
@@ -10,7 +10,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2043_select_for_update.cpp b/maxscale-system-test/mxs2043_select_for_update.cpp
index 05f2bda6f..c7c622c53 100644
--- a/maxscale-system-test/mxs2043_select_for_update.cpp
+++ b/maxscale-system-test/mxs2043_select_for_update.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 //
 // This test makes all slaves read_only and then executes
diff --git a/maxscale-system-test/mxs2054_hybrid_cluster.cpp b/maxscale-system-test/mxs2054_hybrid_cluster.cpp
index b6133b1dd..e8e8d0954 100644
--- a/maxscale-system-test/mxs2054_hybrid_cluster.cpp
+++ b/maxscale-system-test/mxs2054_hybrid_cluster.cpp
@@ -2,7 +2,7 @@
  * MXS-2054: Test "hybrid" clusters with namedserverfilter
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2057_systemd_watchdog.cpp b/maxscale-system-test/mxs2057_systemd_watchdog.cpp
index fed976173..1cd21f6b6 100644
--- a/maxscale-system-test/mxs2057_systemd_watchdog.cpp
+++ b/maxscale-system-test/mxs2057_systemd_watchdog.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <maxbase/stopwatch.hh>
 
 namespace
diff --git a/maxscale-system-test/mxs2106_avro_null.cpp b/maxscale-system-test/mxs2106_avro_null.cpp
index a82d5d557..e67107d51 100644
--- a/maxscale-system-test/mxs2106_avro_null.cpp
+++ b/maxscale-system-test/mxs2106_avro_null.cpp
@@ -2,7 +2,7 @@
  * MXS-2106: Maxscale CDC JSON output does not respect null values
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <cdc_connector.h>
 
 int main(int argc, char** argv)
diff --git a/maxscale-system-test/mxs2111_auth_string.cpp b/maxscale-system-test/mxs2111_auth_string.cpp
index 5932fc510..b4d1bcee0 100644
--- a/maxscale-system-test/mxs2111_auth_string.cpp
+++ b/maxscale-system-test/mxs2111_auth_string.cpp
@@ -2,7 +2,7 @@
  * MXS-2111: The password is stored in `authentication_string` instead of `password` due to MDEV-16774
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2115_version_string.cpp b/maxscale-system-test/mxs2115_version_string.cpp
index 29b9fdf81..12e7d10b6 100644
--- a/maxscale-system-test/mxs2115_version_string.cpp
+++ b/maxscale-system-test/mxs2115_version_string.cpp
@@ -5,7 +5,7 @@
  * same version string.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2167_extra_port.cpp b/maxscale-system-test/mxs2167_extra_port.cpp
index f2e78bb9b..bc6554ce7 100644
--- a/maxscale-system-test/mxs2167_extra_port.cpp
+++ b/maxscale-system-test/mxs2167_extra_port.cpp
@@ -2,7 +2,7 @@
  * MXS-2167: Monitors should be able to use extra_port
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 
 using std::cout;
diff --git a/maxscale-system-test/mxs2187_multi_replay.cpp b/maxscale-system-test/mxs2187_multi_replay.cpp
index b3f9eb31b..80058db05 100644
--- a/maxscale-system-test/mxs2187_multi_replay.cpp
+++ b/maxscale-system-test/mxs2187_multi_replay.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-1507
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 #include <iostream>
 #include <vector>
diff --git a/maxscale-system-test/mxs2273_being_drained.cpp b/maxscale-system-test/mxs2273_being_drained.cpp
index ad2ea22ac..a53d3c1d7 100644
--- a/maxscale-system-test/mxs2273_being_drained.cpp
+++ b/maxscale-system-test/mxs2273_being_drained.cpp
@@ -16,7 +16,7 @@
  * https://jira.mariadb.org/browse/MXS-2273
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <string>
 #include <regex>
diff --git a/maxscale-system-test/mxs2295_change_user_loop.cpp b/maxscale-system-test/mxs2295_change_user_loop.cpp
index 62e963f98..1ad515a46 100644
--- a/maxscale-system-test/mxs2295_change_user_loop.cpp
+++ b/maxscale-system-test/mxs2295_change_user_loop.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2295
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/maxscale-system-test/mxs2300_history_pruning.cpp b/maxscale-system-test/mxs2300_history_pruning.cpp
index 6c3d107ad..81d08f4c8 100644
--- a/maxscale-system-test/mxs2300_history_pruning.cpp
+++ b/maxscale-system-test/mxs2300_history_pruning.cpp
@@ -2,7 +2,7 @@
  * MXS-2300: Session command history pruning
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <sstream>
 
 std::vector<int> ids;
diff --git a/maxscale-system-test/mxs2313_rank.cpp b/maxscale-system-test/mxs2313_rank.cpp
index b59ac1d28..a42de2bf0 100644
--- a/maxscale-system-test/mxs2313_rank.cpp
+++ b/maxscale-system-test/mxs2313_rank.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2313
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 
 std::function<void(int)> block_wait;
diff --git a/maxscale-system-test/mxs2326_hint_clone.cpp b/maxscale-system-test/mxs2326_hint_clone.cpp
index 3224a31dd..55cd4c01c 100644
--- a/maxscale-system-test/mxs2326_hint_clone.cpp
+++ b/maxscale-system-test/mxs2326_hint_clone.cpp
@@ -2,7 +2,7 @@
  * MXS-2326: Routing hints aren't cloned in gwbuf_clone
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2350_lazy_connect.cpp b/maxscale-system-test/mxs2350_lazy_connect.cpp
index 0021f3e4a..b4dc23d24 100644
--- a/maxscale-system-test/mxs2350_lazy_connect.cpp
+++ b/maxscale-system-test/mxs2350_lazy_connect.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2350
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <maxbase/string.hh>
 
 int main(int argc, char* argv[])
diff --git a/maxscale-system-test/mxs2355_wrong_auth.cpp b/maxscale-system-test/mxs2355_wrong_auth.cpp
index e497fee34..6e0d10747 100644
--- a/maxscale-system-test/mxs2355_wrong_auth.cpp
+++ b/maxscale-system-test/mxs2355_wrong_auth.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 // Try to connect with mysql client using the plugin "mysql_clear_password". MaxScale should switch back
 // to "mysql_native_password".
diff --git a/maxscale-system-test/mxs2414_host_blocking.cpp b/maxscale-system-test/mxs2414_host_blocking.cpp
index d80dbb90c..da042a9ca 100644
--- a/maxscale-system-test/mxs2414_host_blocking.cpp
+++ b/maxscale-system-test/mxs2414_host_blocking.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2414
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp b/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp
index 75049f0d5..760cb4fea 100644
--- a/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp
+++ b/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2417
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2441_galera_slaves.cpp b/maxscale-system-test/mxs2441_galera_slaves.cpp
index 69da6a51f..0c65c5d95 100644
--- a/maxscale-system-test/mxs2441_galera_slaves.cpp
+++ b/maxscale-system-test/mxs2441_galera_slaves.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2441
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 
 #include <maxbase/string.hh>
diff --git a/maxscale-system-test/mxs244_prepared_stmt_loop.cpp b/maxscale-system-test/mxs244_prepared_stmt_loop.cpp
index 53ef38c64..494b5428c 100644
--- a/maxscale-system-test/mxs244_prepared_stmt_loop.cpp
+++ b/maxscale-system-test/mxs244_prepared_stmt_loop.cpp
@@ -13,7 +13,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2450_change_user_crash.cpp b/maxscale-system-test/mxs2450_change_user_crash.cpp
index a04223db4..f990ca97f 100644
--- a/maxscale-system-test/mxs2450_change_user_crash.cpp
+++ b/maxscale-system-test/mxs2450_change_user_crash.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2450
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/maxscale-system-test/mxs2456_trx_replay_cap.cpp b/maxscale-system-test/mxs2456_trx_replay_cap.cpp
index aa094fc90..b4efc18da 100644
--- a/maxscale-system-test/mxs2456_trx_replay_cap.cpp
+++ b/maxscale-system-test/mxs2456_trx_replay_cap.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2456
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #define EXPECT(a) test.expect(a, "%s", "Assertion failed: " #a)
 
diff --git a/maxscale-system-test/mxs2464_sescmd_reconnect.cpp b/maxscale-system-test/mxs2464_sescmd_reconnect.cpp
index 989e62560..2f97b3435 100644
--- a/maxscale-system-test/mxs2464_sescmd_reconnect.cpp
+++ b/maxscale-system-test/mxs2464_sescmd_reconnect.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2464
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2490_ps_execute_direct.cpp b/maxscale-system-test/mxs2490_ps_execute_direct.cpp
index 6e5735ae5..5a49de980 100644
--- a/maxscale-system-test/mxs2490_ps_execute_direct.cpp
+++ b/maxscale-system-test/mxs2490_ps_execute_direct.cpp
@@ -7,7 +7,7 @@
  * https://mariadb.com/kb/en/library/com_stmt_execute/#statement-id
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2520_master_read_reconnect.cpp b/maxscale-system-test/mxs2520_master_read_reconnect.cpp
index 5a0955884..6f5ec9189 100644
--- a/maxscale-system-test/mxs2520_master_read_reconnect.cpp
+++ b/maxscale-system-test/mxs2520_master_read_reconnect.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2520
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2521_double_exec.cpp b/maxscale-system-test/mxs2521_double_exec.cpp
index c6ef40729..f8a2af2a2 100644
--- a/maxscale-system-test/mxs2521_double_exec.cpp
+++ b/maxscale-system-test/mxs2521_double_exec.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2521
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void do_test(TestConnections& test, MYSQL* conn)
 {
diff --git a/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp b/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp
index 3eefd4198..d39003bc0 100644
--- a/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp
+++ b/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2563
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2609_history_replay.cpp b/maxscale-system-test/mxs2609_history_replay.cpp
index add9b50e2..481a80d59 100644
--- a/maxscale-system-test/mxs2609_history_replay.cpp
+++ b/maxscale-system-test/mxs2609_history_replay.cpp
@@ -9,7 +9,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2621_lower_case_tables.cpp b/maxscale-system-test/mxs2621_lower_case_tables.cpp
index 62351237a..718ea0ed8 100644
--- a/maxscale-system-test/mxs2621_lower_case_tables.cpp
+++ b/maxscale-system-test/mxs2621_lower_case_tables.cpp
@@ -3,7 +3,7 @@
  * https://jira.mariadb.org/browse/MXS-2621
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2631_ignore_system_tables.cpp b/maxscale-system-test/mxs2631_ignore_system_tables.cpp
index 3eaf5928e..841b4eb18 100644
--- a/maxscale-system-test/mxs2631_ignore_system_tables.cpp
+++ b/maxscale-system-test/mxs2631_ignore_system_tables.cpp
@@ -6,7 +6,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp b/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp
index 823d7f35a..f47d2f48b 100644
--- a/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp
+++ b/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp
@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <sstream>
 
 int main(int argc, char** argv)
diff --git a/maxscale-system-test/mxs280_select_outfile.cpp b/maxscale-system-test/mxs280_select_outfile.cpp
index b5e62498e..669a3bd38 100644
--- a/maxscale-system-test/mxs280_select_outfile.cpp
+++ b/maxscale-system-test/mxs280_select_outfile.cpp
@@ -10,8 +10,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs2878_monitor_ssl.cpp b/maxscale-system-test/mxs2878_monitor_ssl.cpp
index a86495ae3..d19be0c2e 100644
--- a/maxscale-system-test/mxs2878_monitor_ssl.cpp
+++ b/maxscale-system-test/mxs2878_monitor_ssl.cpp
@@ -4,7 +4,7 @@
  * MXS-2896: Server wrongly in Running state after failure to connect
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <sstream>
 
 std::string join(StringSet st)
diff --git a/maxscale-system-test/mxs2919_broken_slaves.cpp b/maxscale-system-test/mxs2919_broken_slaves.cpp
index e671b5647..94456e627 100644
--- a/maxscale-system-test/mxs2919_broken_slaves.cpp
+++ b/maxscale-system-test/mxs2919_broken_slaves.cpp
@@ -3,7 +3,7 @@
  * used.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2939_sescmd_reconnect.cpp b/maxscale-system-test/mxs2939_sescmd_reconnect.cpp
index 97686228e..1cc9d3436 100644
--- a/maxscale-system-test/mxs2939_sescmd_reconnect.cpp
+++ b/maxscale-system-test/mxs2939_sescmd_reconnect.cpp
@@ -2,7 +2,7 @@
  * MXS-2939: Test that session commands trigger a reconnection
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs2972_shard_caching.cc b/maxscale-system-test/mxs2972_shard_caching.cc
index fb78e734d..22f957b8f 100644
--- a/maxscale-system-test/mxs2972_shard_caching.cc
+++ b/maxscale-system-test/mxs2972_shard_caching.cc
@@ -1,4 +1,4 @@
-#include <testconnections.h>
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs314.cpp b/maxscale-system-test/mxs314.cpp
index 659b37e98..a040bdb34 100644
--- a/maxscale-system-test/mxs314.cpp
+++ b/maxscale-system-test/mxs314.cpp
@@ -4,7 +4,7 @@
  * - check if Maxscale alive
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs321.cpp b/maxscale-system-test/mxs321.cpp
index c60dd39aa..7314b481a 100644
--- a/maxscale-system-test/mxs321.cpp
+++ b/maxscale-system-test/mxs321.cpp
@@ -12,8 +12,8 @@
 #include <unistd.h>
 #include <cstdlib>
 #include <string>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs359_error_on_write.cpp b/maxscale-system-test/mxs359_error_on_write.cpp
index 21a3811e0..7ab1d883b 100644
--- a/maxscale-system-test/mxs359_error_on_write.cpp
+++ b/maxscale-system-test/mxs359_error_on_write.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-359
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <iostream>
 #include <functional>
diff --git a/maxscale-system-test/mxs359_master_switch.cpp b/maxscale-system-test/mxs359_master_switch.cpp
index 11bfc2827..4e60183b6 100644
--- a/maxscale-system-test/mxs359_master_switch.cpp
+++ b/maxscale-system-test/mxs359_master_switch.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-359
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 TestConnections* global_test;
 
diff --git a/maxscale-system-test/mxs359_read_only.cpp b/maxscale-system-test/mxs359_read_only.cpp
index 7e45da89a..189b2dbe4 100644
--- a/maxscale-system-test/mxs359_read_only.cpp
+++ b/maxscale-system-test/mxs359_read_only.cpp
@@ -3,7 +3,7 @@
  *
  * https://jira.mariadb.org/browse/MXS-359
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <iostream>
 #include <sstream>
diff --git a/maxscale-system-test/mxs365.cpp b/maxscale-system-test/mxs365.cpp
index 208523a5c..6fe1cafdc 100644
--- a/maxscale-system-test/mxs365.cpp
+++ b/maxscale-system-test/mxs365.cpp
@@ -6,7 +6,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void create_data_file(char* filename, size_t size)
 {
diff --git a/maxscale-system-test/mxs37_table_privilege.cpp b/maxscale-system-test/mxs37_table_privilege.cpp
index 363d69b04..eeeb25444 100644
--- a/maxscale-system-test/mxs37_table_privilege.cpp
+++ b/maxscale-system-test/mxs37_table_privilege.cpp
@@ -7,8 +7,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs421_events.cpp b/maxscale-system-test/mxs421_events.cpp
index b60f7d003..4d612f924 100644
--- a/maxscale-system-test/mxs421_events.cpp
+++ b/maxscale-system-test/mxs421_events.cpp
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs431.cpp b/maxscale-system-test/mxs431.cpp
index 7daa77c64..d136c8a6b 100644
--- a/maxscale-system-test/mxs431.cpp
+++ b/maxscale-system-test/mxs431.cpp
@@ -5,7 +5,7 @@
  * - Connect repeatedly to MaxScale with 'testdb' as the default database and execute SELECT 1
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/mxs548_short_session_change_user.cpp b/maxscale-system-test/mxs548_short_session_change_user.cpp
index 7111ff5f3..bd797f2bf 100644
--- a/maxscale-system-test/mxs548_short_session_change_user.cpp
+++ b/maxscale-system-test/mxs548_short_session_change_user.cpp
@@ -11,8 +11,8 @@
  */
 
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 #include <atomic>
 
diff --git a/maxscale-system-test/mxs559_block_master.cpp b/maxscale-system-test/mxs559_block_master.cpp
index 919708086..7a1cbb131 100644
--- a/maxscale-system-test/mxs559_block_master.cpp
+++ b/maxscale-system-test/mxs559_block_master.cpp
@@ -10,8 +10,8 @@
  */
 
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 #include <string>
 
 typedef struct
diff --git a/maxscale-system-test/mxs564_big_dump.cpp b/maxscale-system-test/mxs564_big_dump.cpp
index b906908b2..b9784d050 100644
--- a/maxscale-system-test/mxs564_big_dump.cpp
+++ b/maxscale-system-test/mxs564_big_dump.cpp
@@ -10,8 +10,8 @@
  * - check Maxscale is alive
  */
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 #include <atomic>
 #include <thread>
diff --git a/maxscale-system-test/mxs621_unreadable_cnf.cpp b/maxscale-system-test/mxs621_unreadable_cnf.cpp
index d29222b4c..edb97555b 100644
--- a/maxscale-system-test/mxs621_unreadable_cnf.cpp
+++ b/maxscale-system-test/mxs621_unreadable_cnf.cpp
@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs657_restart_service.cpp b/maxscale-system-test/mxs657_restart_service.cpp
index 47e55f579..52216548d 100644
--- a/maxscale-system-test/mxs657_restart_service.cpp
+++ b/maxscale-system-test/mxs657_restart_service.cpp
@@ -10,7 +10,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 void* query_thread1(void* ptr);
diff --git a/maxscale-system-test/mxs682_cyrillic.cpp b/maxscale-system-test/mxs682_cyrillic.cpp
index d69bcf4ca..0eca3e7b8 100644
--- a/maxscale-system-test/mxs682_cyrillic.cpp
+++ b/maxscale-system-test/mxs682_cyrillic.cpp
@@ -4,7 +4,7 @@
  * - check SELECT from backend
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void check_val(MYSQL* conn, TestConnections& test)
 {
diff --git a/maxscale-system-test/mxs701_binlog_filter.cpp b/maxscale-system-test/mxs701_binlog_filter.cpp
index ac42e0761..56c6af641 100644
--- a/maxscale-system-test/mxs701_binlog_filter.cpp
+++ b/maxscale-system-test/mxs701_binlog_filter.cpp
@@ -2,7 +2,7 @@
  * MXS-701: Binlog filtering
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/mxs716.cpp b/maxscale-system-test/mxs716.cpp
index d112706b2..d0fea6600 100644
--- a/maxscale-system-test/mxs716.cpp
+++ b/maxscale-system-test/mxs716.cpp
@@ -9,8 +9,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 void run_test(TestConnections* Test, const char* database)
 {
diff --git a/maxscale-system-test/mxs722.cpp b/maxscale-system-test/mxs722.cpp
index b015755db..424840dd8 100644
--- a/maxscale-system-test/mxs722.cpp
+++ b/maxscale-system-test/mxs722.cpp
@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs729_maxadmin.cpp b/maxscale-system-test/mxs729_maxadmin.cpp
index 88aaba513..6d9708a29 100644
--- a/maxscale-system-test/mxs729_maxadmin.cpp
+++ b/maxscale-system-test/mxs729_maxadmin.cpp
@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs812_1.cpp b/maxscale-system-test/mxs812_1.cpp
index 07628a0ea..b19545b5f 100644
--- a/maxscale-system-test/mxs812_1.cpp
+++ b/maxscale-system-test/mxs812_1.cpp
@@ -9,7 +9,7 @@
  * - repeat test 2 times
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void run_test(TestConnections& test, size_t size, int chunks)
 {
diff --git a/maxscale-system-test/mxs812_2.cpp b/maxscale-system-test/mxs812_2.cpp
index e42c5179a..ed9f4459a 100644
--- a/maxscale-system-test/mxs812_2.cpp
+++ b/maxscale-system-test/mxs812_2.cpp
@@ -6,7 +6,7 @@
  * - checks "Current no. of conns" after the test, expect 0
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int test_ps(TestConnections* Test, MYSQL* conn)
 {
diff --git a/maxscale-system-test/mxs813_long_hostname.cpp b/maxscale-system-test/mxs813_long_hostname.cpp
index d083d5e59..0ecad3bdc 100644
--- a/maxscale-system-test/mxs813_long_hostname.cpp
+++ b/maxscale-system-test/mxs813_long_hostname.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs822_maxpasswd.cpp b/maxscale-system-test/mxs822_maxpasswd.cpp
index 81a457bb4..735fa1968 100644
--- a/maxscale-system-test/mxs822_maxpasswd.cpp
+++ b/maxscale-system-test/mxs822_maxpasswd.cpp
@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs827_write_timeout.cpp b/maxscale-system-test/mxs827_write_timeout.cpp
index 710632f0c..19c25d7d4 100644
--- a/maxscale-system-test/mxs827_write_timeout.cpp
+++ b/maxscale-system-test/mxs827_write_timeout.cpp
@@ -8,8 +8,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs872_roles.cpp b/maxscale-system-test/mxs872_roles.cpp
index 88aeb52b2..8858fdc4c 100644
--- a/maxscale-system-test/mxs872_roles.cpp
+++ b/maxscale-system-test/mxs872_roles.cpp
@@ -4,7 +4,7 @@
  * https://jira.mariadb.org/browse/MXS-872
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 
 using namespace std;
diff --git a/maxscale-system-test/mxs874_slave_recovery.cpp b/maxscale-system-test/mxs874_slave_recovery.cpp
index 140df159c..03b5400c9 100644
--- a/maxscale-system-test/mxs874_slave_recovery.cpp
+++ b/maxscale-system-test/mxs874_slave_recovery.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/mxs922_bad_server.cpp b/maxscale-system-test/mxs922_bad_server.cpp
index 236880841..75064d886 100644
--- a/maxscale-system-test/mxs922_bad_server.cpp
+++ b/maxscale-system-test/mxs922_bad_server.cpp
@@ -3,7 +3,7 @@
  *
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #define MONITOR_NAME "mysql-monitor"
 #define SERVICE_NAME "rwsplit-service"
diff --git a/maxscale-system-test/mxs922_restart.cpp b/maxscale-system-test/mxs922_restart.cpp
index 8ef62780d..522a5a83c 100644
--- a/maxscale-system-test/mxs922_restart.cpp
+++ b/maxscale-system-test/mxs922_restart.cpp
@@ -3,7 +3,7 @@
  *
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #define MONITOR_NAME  "mysql-monitor"
 #define SERVICE_NAME1 "rwsplit-service"
diff --git a/maxscale-system-test/mxs951_utfmb4.cpp b/maxscale-system-test/mxs951_utfmb4.cpp
index e3c1c8fa1..654d7e1b3 100644
--- a/maxscale-system-test/mxs951_utfmb4.cpp
+++ b/maxscale-system-test/mxs951_utfmb4.cpp
@@ -14,7 +14,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/namedserverfilter.cpp b/maxscale-system-test/namedserverfilter.cpp
index 408d5b984..167488f46 100644
--- a/maxscale-system-test/namedserverfilter.cpp
+++ b/maxscale-system-test/namedserverfilter.cpp
@@ -6,7 +6,7 @@
  * `match=SELECT` which should match any SELECT query.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 
 using std::cout;
diff --git a/maxscale-system-test/no_password.cpp b/maxscale-system-test/no_password.cpp
index 325a889b9..ba20f2c67 100644
--- a/maxscale-system-test/no_password.cpp
+++ b/maxscale-system-test/no_password.cpp
@@ -2,7 +2,7 @@
  * Check that using no password returns correct error message
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/non_native_setup.cpp b/maxscale-system-test/non_native_setup.cpp
index a48c2e682..60592fc0f 100644
--- a/maxscale-system-test/non_native_setup.cpp
+++ b/maxscale-system-test/non_native_setup.cpp
@@ -8,7 +8,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/open_close_connections.cpp b/maxscale-system-test/open_close_connections.cpp
index 64bb5e176..437aee82a 100644
--- a/maxscale-system-test/open_close_connections.cpp
+++ b/maxscale-system-test/open_close_connections.cpp
@@ -4,7 +4,7 @@
  * - 20 threads are opening and immediatelly closing connection in the loop
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <atomic>
 #include <vector>
diff --git a/maxscale-system-test/pam_authentication.cpp b/maxscale-system-test/pam_authentication.cpp
index ec89f7e58..246118f6e 100644
--- a/maxscale-system-test/pam_authentication.cpp
+++ b/maxscale-system-test/pam_authentication.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>
diff --git a/maxscale-system-test/pers_01.cpp b/maxscale-system-test/pers_01.cpp
index ec25af5cf..ffc551976 100644
--- a/maxscale-system-test/pers_01.cpp
+++ b/maxscale-system-test/pers_01.cpp
@@ -29,8 +29,8 @@
  */
 
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 void check_pers_conn(TestConnections* Test, int pers_conn_expected[], char* server)
 {
diff --git a/maxscale-system-test/pers_02.cpp b/maxscale-system-test/pers_02.cpp
index f3ec95641..2be76bb43 100644
--- a/maxscale-system-test/pers_02.cpp
+++ b/maxscale-system-test/pers_02.cpp
@@ -12,8 +12,8 @@
  */
 
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 
 int main(int argc, char* argv[])
diff --git a/maxscale-system-test/prepared_statement.cpp b/maxscale-system-test/prepared_statement.cpp
index b3009450d..1e9a8a5ed 100644
--- a/maxscale-system-test/prepared_statement.cpp
+++ b/maxscale-system-test/prepared_statement.cpp
@@ -11,8 +11,8 @@
  * - check if Maxscale is alive
  */
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/proxy_protocol.cpp b/maxscale-system-test/proxy_protocol.cpp
index 7639cb1ca..eaf352329 100644
--- a/maxscale-system-test/proxy_protocol.cpp
+++ b/maxscale-system-test/proxy_protocol.cpp
@@ -8,7 +8,7 @@
 
 #include <iostream>
 #include <string>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::string;
 using std::cout;
diff --git a/maxscale-system-test/readconnrouter_master.cpp b/maxscale-system-test/readconnrouter_master.cpp
index e271ac8a7..9d62402e3 100644
--- a/maxscale-system-test/readconnrouter_master.cpp
+++ b/maxscale-system-test/readconnrouter_master.cpp
@@ -2,7 +2,7 @@
  * Connect to readconnroute in master mode and check that it always connects to the master
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/readconnrouter_slave.cpp b/maxscale-system-test/readconnrouter_slave.cpp
index f23c4a4b5..888ab1650 100644
--- a/maxscale-system-test/readconnrouter_slave.cpp
+++ b/maxscale-system-test/readconnrouter_slave.cpp
@@ -8,7 +8,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/regexfilter1.cpp b/maxscale-system-test/regexfilter1.cpp
index 75a58a128..65541ea19 100644
--- a/maxscale-system-test/regexfilter1.cpp
+++ b/maxscale-system-test/regexfilter1.cpp
@@ -9,7 +9,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/rwsplit_conn_num.cpp b/maxscale-system-test/rwsplit_conn_num.cpp
index 7113282d1..2b4e9b843 100644
--- a/maxscale-system-test/rwsplit_conn_num.cpp
+++ b/maxscale-system-test/rwsplit_conn_num.cpp
@@ -7,7 +7,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/rwsplit_connect.cpp b/maxscale-system-test/rwsplit_connect.cpp
index 047e41627..b8bca0ef8 100644
--- a/maxscale-system-test/rwsplit_connect.cpp
+++ b/maxscale-system-test/rwsplit_connect.cpp
@@ -4,7 +4,7 @@
  * - check number of connections on every backend, expect one active Slave and one connection to Master
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/rwsplit_multi_stmt.cpp b/maxscale-system-test/rwsplit_multi_stmt.cpp
index 68e68e892..cddd33367 100644
--- a/maxscale-system-test/rwsplit_multi_stmt.cpp
+++ b/maxscale-system-test/rwsplit_multi_stmt.cpp
@@ -9,7 +9,7 @@
  * - Only the multi-statement query should go to the master
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {
diff --git a/maxscale-system-test/rwsplit_readonly.cpp b/maxscale-system-test/rwsplit_readonly.cpp
index ae6eb917a..c98946804 100644
--- a/maxscale-system-test/rwsplit_readonly.cpp
+++ b/maxscale-system-test/rwsplit_readonly.cpp
@@ -10,8 +10,8 @@
 #include <unistd.h>
 #include <cstdlib>
 #include <string>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 void test_all_ok(TestConnections* Test)
 {
diff --git a/maxscale-system-test/rwsplit_readonly_stress.cpp b/maxscale-system-test/rwsplit_readonly_stress.cpp
index e1c721888..234ad8713 100644
--- a/maxscale-system-test/rwsplit_readonly_stress.cpp
+++ b/maxscale-system-test/rwsplit_readonly_stress.cpp
@@ -9,8 +9,8 @@
 #include <unistd.h>
 #include <cstdlib>
 #include <string>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 #define THREADS 16
 
diff --git a/maxscale-system-test/sanity_check.cpp b/maxscale-system-test/sanity_check.cpp
index 4f17c7ad1..c6ff156a0 100644
--- a/maxscale-system-test/sanity_check.cpp
+++ b/maxscale-system-test/sanity_check.cpp
@@ -4,7 +4,7 @@
  * Combines several old regression tests into one quick test.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 
 void test_rwsplit(TestConnections& test)
diff --git a/maxscale-system-test/schemarouter_duplicate.cpp b/maxscale-system-test/schemarouter_duplicate.cpp
index 2935aac38..3109188d9 100644
--- a/maxscale-system-test/schemarouter_duplicate.cpp
+++ b/maxscale-system-test/schemarouter_duplicate.cpp
@@ -10,7 +10,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/script.cpp b/maxscale-system-test/script.cpp
index 6ab95fd56..41d7af88d 100644
--- a/maxscale-system-test/script.cpp
+++ b/maxscale-system-test/script.cpp
@@ -34,7 +34,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void test_script_monitor(TestConnections* Test, Mariadb_nodes* nodes, char* expected_filename)
 {
diff --git a/maxscale-system-test/sequence.cpp b/maxscale-system-test/sequence.cpp
index baef1d5d0..75e480164 100644
--- a/maxscale-system-test/sequence.cpp
+++ b/maxscale-system-test/sequence.cpp
@@ -4,7 +4,7 @@
  * This test is only enabled when the backend version is 10.3
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 
 int main(int argc, char** argv)
diff --git a/maxscale-system-test/server_weight.cpp b/maxscale-system-test/server_weight.cpp
index a59fb5859..afff043d0 100644
--- a/maxscale-system-test/server_weight.cpp
+++ b/maxscale-system-test/server_weight.cpp
@@ -8,7 +8,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void check_conn_num(TestConnections& test, int* Nc)
 {
diff --git a/maxscale-system-test/session_limits.cpp b/maxscale-system-test/session_limits.cpp
index 7e3700509..510aa23ff 100644
--- a/maxscale-system-test/session_limits.cpp
+++ b/maxscale-system-test/session_limits.cpp
@@ -14,7 +14,7 @@
  * - execute one more session commad, excpect failure
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/sharding.cpp b/maxscale-system-test/sharding.cpp
index af87a5b74..10ff6d8df 100644
--- a/maxscale-system-test/sharding.cpp
+++ b/maxscale-system-test/sharding.cpp
@@ -34,7 +34,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/sharding_load_data.cpp b/maxscale-system-test/sharding_load_data.cpp
index 224a5b3be..be3df57d0 100644
--- a/maxscale-system-test/sharding_load_data.cpp
+++ b/maxscale-system-test/sharding_load_data.cpp
@@ -2,7 +2,7 @@
  * MXS-1160: LOAD DATA LOCAL INFILE with schemarouter
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <fstream>
 #include <sstream>
diff --git a/maxscale-system-test/short_sessions.cpp b/maxscale-system-test/short_sessions.cpp
index 5651fd812..8b8542198 100644
--- a/maxscale-system-test/short_sessions.cpp
+++ b/maxscale-system-test/short_sessions.cpp
@@ -11,8 +11,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/show_monitor_crash.cpp b/maxscale-system-test/show_monitor_crash.cpp
index 9eb0a0706..f155d6fb1 100644
--- a/maxscale-system-test/show_monitor_crash.cpp
+++ b/maxscale-system-test/show_monitor_crash.cpp
@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/slave_failover.cpp b/maxscale-system-test/slave_failover.cpp
index cd31bbe78..91475293f 100644
--- a/maxscale-system-test/slave_failover.cpp
+++ b/maxscale-system-test/slave_failover.cpp
@@ -13,7 +13,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/smart_query.cpp b/maxscale-system-test/smart_query.cpp
index ab24226a3..003cc5e13 100644
--- a/maxscale-system-test/smart_query.cpp
+++ b/maxscale-system-test/smart_query.cpp
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <maxbase/stopwatch.hh>
 #include <iostream>
 #include <vector>
diff --git a/maxscale-system-test/sql_queries.cpp b/maxscale-system-test/sql_queries.cpp
index 4bdb465c3..47ab1092f 100644
--- a/maxscale-system-test/sql_queries.cpp
+++ b/maxscale-system-test/sql_queries.cpp
@@ -41,8 +41,8 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/sr_basics.cpp b/maxscale-system-test/sr_basics.cpp
index 4a90ccf3a..1524479dc 100644
--- a/maxscale-system-test/sr_basics.cpp
+++ b/maxscale-system-test/sr_basics.cpp
@@ -15,7 +15,7 @@
 #include <map>
 #include <vector>
 #include <maxbase/assert.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/stale_slaves.cpp b/maxscale-system-test/stale_slaves.cpp
index 7bccbcb93..4bb8747ed 100644
--- a/maxscale-system-test/stale_slaves.cpp
+++ b/maxscale-system-test/stale_slaves.cpp
@@ -6,7 +6,7 @@
  * should get slave status if replication is running.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #include <algorithm>
 #include <string>
diff --git a/maxscale-system-test/sysbench_example.cpp b/maxscale-system-test/sysbench_example.cpp
index 74632da0f..b73af326f 100644
--- a/maxscale-system-test/sysbench_example.cpp
+++ b/maxscale-system-test/sysbench_example.cpp
@@ -8,7 +8,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "sysbench_commands.h"
 
 int main(int argc, char* argv[])
diff --git a/maxscale-system-test/sysbench_kill_slave.cpp b/maxscale-system-test/sysbench_kill_slave.cpp
index 669a8dde0..b5e5a4019 100644
--- a/maxscale-system-test/sysbench_kill_slave.cpp
+++ b/maxscale-system-test/sysbench_kill_slave.cpp
@@ -8,7 +8,7 @@
  * - check if Maxscale is alive
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "sysbench_commands.h"
 
 TestConnections* Test;
diff --git a/maxscale-system-test/t.cpp b/maxscale-system-test/t.cpp
index d996a2938..660e98464 100644
--- a/maxscale-system-test/t.cpp
+++ b/maxscale-system-test/t.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <ctime>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
 
 int main(int argc, char* argv[])
 {
diff --git a/maxscale-system-test/temporal_tables.cpp b/maxscale-system-test/temporal_tables.cpp
index 7e4162bfa..e476669dc 100644
--- a/maxscale-system-test/temporal_tables.cpp
+++ b/maxscale-system-test/temporal_tables.cpp
@@ -11,8 +11,8 @@
  * - check that data from main t1 is not affected
  */
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 
diff --git a/maxscale-system-test/test_hints.cpp b/maxscale-system-test/test_hints.cpp
index d95fc42cf..b59c12716 100644
--- a/maxscale-system-test/test_hints.cpp
+++ b/maxscale-system-test/test_hints.cpp
@@ -6,7 +6,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #define SERVER1 0
 #define SERVER2 1