diff --git a/maxctrl/CMakeLists.txt b/maxctrl/CMakeLists.txt
index 76b63237e..e0f6eaecd 100644
--- a/maxctrl/CMakeLists.txt
+++ b/maxctrl/CMakeLists.txt
@@ -9,5 +9,3 @@ if (NPM_FOUND)
 else()
   message(STATUS "Not building MaxCtrl: npm not found")
 endif()
-
-add_subdirectory(test)
diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt
index edf0d19e9..0696b650d 100644
--- a/server/core/test/CMakeLists.txt
+++ b/server/core/test/CMakeLists.txt
@@ -83,3 +83,5 @@ add_test(TestTrxCompare_Update test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../..
 add_test(TestTrxCompare_MaxScale test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/maxscale.test)
 add_test(TestJson testjson)
 add_test(TestHttp testhttp)
+
+add_subdirectory(rest-api)
diff --git a/maxctrl/test/CMakeLists.txt b/server/core/test/rest-api/CMakeLists.txt
similarity index 100%
rename from maxctrl/test/CMakeLists.txt
rename to server/core/test/rest-api/CMakeLists.txt
diff --git a/maxctrl/test/after.sh b/server/core/test/rest-api/after.sh
similarity index 100%
rename from maxctrl/test/after.sh
rename to server/core/test/rest-api/after.sh
diff --git a/maxctrl/test/before.sh b/server/core/test/rest-api/before.sh
similarity index 100%
rename from maxctrl/test/before.sh
rename to server/core/test/rest-api/before.sh
diff --git a/maxctrl/test/docker-compose.yml b/server/core/test/rest-api/docker-compose.yml
similarity index 100%
rename from maxctrl/test/docker-compose.yml
rename to server/core/test/rest-api/docker-compose.yml
diff --git a/maxctrl/test/package.json b/server/core/test/rest-api/package.json
similarity index 100%
rename from maxctrl/test/package.json
rename to server/core/test/rest-api/package.json
diff --git a/maxctrl/test/sql/master/users.sql b/server/core/test/rest-api/sql/master/users.sql
similarity index 100%
rename from maxctrl/test/sql/master/users.sql
rename to server/core/test/rest-api/sql/master/users.sql
diff --git a/maxctrl/test/sql/slave/replication.sql b/server/core/test/rest-api/sql/slave/replication.sql
similarity index 100%
rename from maxctrl/test/sql/slave/replication.sql
rename to server/core/test/rest-api/sql/slave/replication.sql
diff --git a/maxctrl/test/test/auth.js b/server/core/test/rest-api/test/auth.js
similarity index 100%
rename from maxctrl/test/test/auth.js
rename to server/core/test/rest-api/test/auth.js
diff --git a/maxctrl/test/test/core.js b/server/core/test/rest-api/test/core.js
similarity index 100%
rename from maxctrl/test/test/core.js
rename to server/core/test/rest-api/test/core.js
diff --git a/maxctrl/test/test/errors.js b/server/core/test/rest-api/test/errors.js
similarity index 100%
rename from maxctrl/test/test/errors.js
rename to server/core/test/rest-api/test/errors.js
diff --git a/maxctrl/test/test/http.js b/server/core/test/rest-api/test/http.js
similarity index 100%
rename from maxctrl/test/test/http.js
rename to server/core/test/rest-api/test/http.js
diff --git a/maxctrl/test/test/logs.js b/server/core/test/rest-api/test/logs.js
similarity index 100%
rename from maxctrl/test/test/logs.js
rename to server/core/test/rest-api/test/logs.js
diff --git a/maxctrl/test/test/monitor.js b/server/core/test/rest-api/test/monitor.js
similarity index 100%
rename from maxctrl/test/test/monitor.js
rename to server/core/test/rest-api/test/monitor.js
diff --git a/maxctrl/test/test/options.js b/server/core/test/rest-api/test/options.js
similarity index 100%
rename from maxctrl/test/test/options.js
rename to server/core/test/rest-api/test/options.js
diff --git a/maxctrl/test/test/schema_validation.js b/server/core/test/rest-api/test/schema_validation.js
similarity index 100%
rename from maxctrl/test/test/schema_validation.js
rename to server/core/test/rest-api/test/schema_validation.js
diff --git a/maxctrl/test/test/server.js b/server/core/test/rest-api/test/server.js
similarity index 100%
rename from maxctrl/test/test/server.js
rename to server/core/test/rest-api/test/server.js
diff --git a/maxctrl/test/test/service.js b/server/core/test/rest-api/test/service.js
similarity index 100%
rename from maxctrl/test/test/service.js
rename to server/core/test/rest-api/test/service.js
diff --git a/maxctrl/test/test/users.js b/server/core/test/rest-api/test/users.js
similarity index 100%
rename from maxctrl/test/test/users.js
rename to server/core/test/rest-api/test/users.js
diff --git a/maxctrl/test/test_rest_api.sh b/server/core/test/rest-api/test_rest_api.sh
similarity index 97%
rename from maxctrl/test/test_rest_api.sh
rename to server/core/test/rest-api/test_rest_api.sh
index c98db21cc..86ddc4978 100755
--- a/maxctrl/test/test_rest_api.sh
+++ b/server/core/test/rest-api/test_rest_api.sh
@@ -16,7 +16,7 @@ testdir=$PWD/local_test/
 mkdir -p $testdir && cd $testdir
 
 # Currently all tests that use npm are for the REST API
-cp -t $testdir -r $srcdir/maxctrl/test/*
+cp -t $testdir -r $srcdir/server/core/test/rest-api/*
 
 # Bring MariaDB servers up, this is an asynchronous process
 docker-compose up -d || exit 1
diff --git a/maxctrl/test/utils.js b/server/core/test/rest-api/utils.js
similarity index 100%
rename from maxctrl/test/utils.js
rename to server/core/test/rest-api/utils.js