diff --git a/lib/tests/route/api/templates_test.php b/lib/tests/route/api/templates_test.php
index 3a189cc83fe..4e63e7f14ec 100644
--- a/lib/tests/route/api/templates_test.php
+++ b/lib/tests/route/api/templates_test.php
@@ -16,7 +16,7 @@
 
 namespace core\route\api;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for Templates API.
diff --git a/lib/tests/router/controller_invoker_test.php b/lib/tests/router/controller_invoker_test.php
index 330a92fb93c..838689f7f7c 100644
--- a/lib/tests/router/controller_invoker_test.php
+++ b/lib/tests/router/controller_invoker_test.php
@@ -16,7 +16,7 @@
 
 namespace core\router;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\Response;
 use Psr\Http\Message\ServerRequestInterface;
 
diff --git a/lib/tests/router/middleware/cors_middleware_test.php b/lib/tests/router/middleware/cors_middleware_test.php
index eced3647c97..102dd9f8f4a 100644
--- a/lib/tests/router/middleware/cors_middleware_test.php
+++ b/lib/tests/router/middleware/cors_middleware_test.php
@@ -17,7 +17,7 @@
 namespace core\router\middleware;
 
 use core\di;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use Psr\Http\Message\ResponseInterface;
 
diff --git a/lib/tests/router/middleware/error_handling_middleware_test.php b/lib/tests/router/middleware/error_handling_middleware_test.php
index ff9f298e886..fcaab22b9d2 100644
--- a/lib/tests/router/middleware/error_handling_middleware_test.php
+++ b/lib/tests/router/middleware/error_handling_middleware_test.php
@@ -18,7 +18,7 @@ namespace core\router\middleware;
 
 use core\di;
 use core\router\response_handler;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use Psr\Http\Message\ResponseInterface;
 
diff --git a/lib/tests/router/middleware/moodle_bootstrap_middleware_test.php b/lib/tests/router/middleware/moodle_bootstrap_middleware_test.php
index 323a3b9e911..7d4c3e58635 100644
--- a/lib/tests/router/middleware/moodle_bootstrap_middleware_test.php
+++ b/lib/tests/router/middleware/moodle_bootstrap_middleware_test.php
@@ -18,7 +18,7 @@ namespace core\router\middleware;
 
 use core\di;
 use core\url;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use Slim\Exception\HttpNotFoundException;
 
diff --git a/lib/tests/router/middleware/moodle_route_attribute_middleware_test.php b/lib/tests/router/middleware/moodle_route_attribute_middleware_test.php
index 3a37fc05402..3dfccf2e403 100644
--- a/lib/tests/router/middleware/moodle_route_attribute_middleware_test.php
+++ b/lib/tests/router/middleware/moodle_route_attribute_middleware_test.php
@@ -18,7 +18,7 @@ namespace core\router\middleware;
 
 use core\di;
 use core\router\route_loader_interface;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 
 /**
diff --git a/lib/tests/router/parameters/header_language_test.php b/lib/tests/router/parameters/header_language_test.php
index a9dfaf653e5..4fae6c8be85 100644
--- a/lib/tests/router/parameters/header_language_test.php
+++ b/lib/tests/router/parameters/header_language_test.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 namespace core\router\parameters;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use Psr\Http\Message\ServerRequestInterface;
 
diff --git a/lib/tests/router/parameters/path_component_test.php b/lib/tests/router/parameters/path_component_test.php
index 58e550216e2..898a824cb39 100644
--- a/lib/tests/router/parameters/path_component_test.php
+++ b/lib/tests/router/parameters/path_component_test.php
@@ -16,7 +16,7 @@
 
 namespace core\router\parameters;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use invalid_parameter_exception;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\ServerRequest;
diff --git a/lib/tests/router/parameters/path_course_test.php b/lib/tests/router/parameters/path_course_test.php
index 51bd4a23d31..de37fe37888 100644
--- a/lib/tests/router/parameters/path_course_test.php
+++ b/lib/tests/router/parameters/path_course_test.php
@@ -18,7 +18,7 @@ namespace core\router\parameters;
 
 use core\exception\not_found_exception;
 use core\router\schema\referenced_object;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use stdClass;
 
diff --git a/lib/tests/router/parameters/path_themename_test.php b/lib/tests/router/parameters/path_themename_test.php
index fb155f0fc3b..62bc1cc8493 100644
--- a/lib/tests/router/parameters/path_themename_test.php
+++ b/lib/tests/router/parameters/path_themename_test.php
@@ -16,7 +16,7 @@
 
 namespace core\router\parameters;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use invalid_parameter_exception;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\ServerRequest;
diff --git a/lib/tests/router/parameters/path_user_test.php b/lib/tests/router/parameters/path_user_test.php
index 6045d415989..73902ce309b 100644
--- a/lib/tests/router/parameters/path_user_test.php
+++ b/lib/tests/router/parameters/path_user_test.php
@@ -18,7 +18,7 @@ namespace core\router\parameters;
 
 use core\exception\not_found_exception;
 use core\router\schema\referenced_object;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use stdClass;
 
diff --git a/lib/tests/router/request_validator_test.php b/lib/tests/router/request_validator_test.php
index 6ecdb1f88bf..65cece60658 100644
--- a/lib/tests/router/request_validator_test.php
+++ b/lib/tests/router/request_validator_test.php
@@ -21,7 +21,7 @@ use core\router\schema\parameters\path_parameter;
 use core\router\schema\parameters\query_parameter;
 use core\router\schema\request_body;
 use core\router\schema\response\content\payload_response_type;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\Exception\HttpNotFoundException;
diff --git a/lib/tests/router/response/access_denied_response_test.php b/lib/tests/router/response/access_denied_response_test.php
index 958a0d96035..2844f249d33 100644
--- a/lib/tests/router/response/access_denied_response_test.php
+++ b/lib/tests/router/response/access_denied_response_test.php
@@ -19,7 +19,7 @@ namespace core\router\response;
 use core\exception\access_denied_exception;
 use core\router\schema\response\payload_response;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 
 /**
diff --git a/lib/tests/router/response/empty_response_test.php b/lib/tests/router/response/empty_response_test.php
index 28738f52709..97704f80648 100644
--- a/lib/tests/router/response/empty_response_test.php
+++ b/lib/tests/router/response/empty_response_test.php
@@ -19,7 +19,7 @@ namespace core\router\response;
 use core\exception\access_denied_exception;
 use core\router\schema\response\payload_response;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 
 /**
diff --git a/lib/tests/router/response/exception_response_test.php b/lib/tests/router/response/exception_response_test.php
index 17abbab27cd..74a4c9d9d16 100644
--- a/lib/tests/router/response/exception_response_test.php
+++ b/lib/tests/router/response/exception_response_test.php
@@ -16,7 +16,7 @@
 
 namespace core\router\response;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for the access denied response.
diff --git a/lib/tests/router/response/invalid_parameter_response_test.php b/lib/tests/router/response/invalid_parameter_response_test.php
index 848d0d483be..4be58b3fc34 100644
--- a/lib/tests/router/response/invalid_parameter_response_test.php
+++ b/lib/tests/router/response/invalid_parameter_response_test.php
@@ -18,7 +18,7 @@ namespace core\router\response;
 
 use core\router\schema\response\payload_response;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use invalid_parameter_exception;
 
diff --git a/lib/tests/router/response/not_found_response_test.php b/lib/tests/router/response/not_found_response_test.php
index 5726e41fd3f..8ca7397f096 100644
--- a/lib/tests/router/response/not_found_response_test.php
+++ b/lib/tests/router/response/not_found_response_test.php
@@ -19,7 +19,7 @@ namespace core\router\response;
 use core\exception\not_found_exception;
 use core\router\schema\response\payload_response;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 
 /**
diff --git a/lib/tests/router/route_controller_test.php b/lib/tests/router/route_controller_test.php
index 5654ba47935..1d54dbff8c4 100644
--- a/lib/tests/router/route_controller_test.php
+++ b/lib/tests/router/route_controller_test.php
@@ -17,7 +17,7 @@
 namespace core\router;
 
 use core\router;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\ServerRequest;
 use GuzzleHttp\Psr7\Uri;
diff --git a/lib/tests/router/route_loader_test.php b/lib/tests/router/route_loader_test.php
index ad9a565c282..801ebdc3d90 100644
--- a/lib/tests/router/route_loader_test.php
+++ b/lib/tests/router/route_loader_test.php
@@ -16,7 +16,7 @@
 
 namespace core\router;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use Slim\Routing\RoutingResults;
 
 /**
diff --git a/lib/tests/router/route_test.php b/lib/tests/router/route_test.php
index 072d0f35deb..8f09c6ca573 100644
--- a/lib/tests/router/route_test.php
+++ b/lib/tests/router/route_test.php
@@ -24,7 +24,7 @@ use core\router\schema\parameters\path_parameter;
 use core\router\schema\parameters\query_parameter;
 use core\router\schema\request_body;
 use core\router\schema\response\response;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for user preference API handler.
diff --git a/lib/tests/router/schema/example_test.php b/lib/tests/router/schema/example_test.php
index ee74e2b72fb..48de6177849 100644
--- a/lib/tests/router/schema/example_test.php
+++ b/lib/tests/router/schema/example_test.php
@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 namespace core\router\schema;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for examples.
diff --git a/lib/tests/router/schema/header_object_test.php b/lib/tests/router/schema/header_object_test.php
index ccf9780c59b..36f2efa8187 100644
--- a/lib/tests/router/schema/header_object_test.php
+++ b/lib/tests/router/schema/header_object_test.php
@@ -17,7 +17,7 @@
 namespace core\router\schema;
 
 use core\param;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for header objects.
diff --git a/lib/tests/router/schema/objects/array_of_strings_test.php b/lib/tests/router/schema/objects/array_of_strings_test.php
index 8c3dffa66d1..68a279baf92 100644
--- a/lib/tests/router/schema/objects/array_of_strings_test.php
+++ b/lib/tests/router/schema/objects/array_of_strings_test.php
@@ -18,7 +18,7 @@ namespace core\router\schema\objects;
 
 use core\param;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for the an array of other objects.
diff --git a/lib/tests/router/schema/objects/array_of_things_test.php b/lib/tests/router/schema/objects/array_of_things_test.php
index c17be7e8463..e94196c2a81 100644
--- a/lib/tests/router/schema/objects/array_of_things_test.php
+++ b/lib/tests/router/schema/objects/array_of_things_test.php
@@ -19,7 +19,7 @@ namespace core\router\schema\objects;
 use core\param;
 use core\router\schema\referenced_object;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for the an array of other objects.
diff --git a/lib/tests/router/schema/objects/scalar_type_test.php b/lib/tests/router/schema/objects/scalar_type_test.php
index 6105907688d..979b816eec8 100644
--- a/lib/tests/router/schema/objects/scalar_type_test.php
+++ b/lib/tests/router/schema/objects/scalar_type_test.php
@@ -19,7 +19,7 @@ namespace core\router\schema\objects;
 use core\param;
 use core\router\schema\referenced_object;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use invalid_parameter_exception;
 
 /**
diff --git a/lib/tests/router/schema/objects/schema_object_test.php b/lib/tests/router/schema/objects/schema_object_test.php
index 8d9b7c2f5cc..13ad1680b1c 100644
--- a/lib/tests/router/schema/objects/schema_object_test.php
+++ b/lib/tests/router/schema/objects/schema_object_test.php
@@ -18,7 +18,7 @@ namespace core\router\schema\objects;
 
 use core\router\schema\referenced_object;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for the schema_object.
diff --git a/lib/tests/router/schema/objects/stacktrace_test.php b/lib/tests/router/schema/objects/stacktrace_test.php
index 3ddcb13e912..a82b78cdadc 100644
--- a/lib/tests/router/schema/objects/stacktrace_test.php
+++ b/lib/tests/router/schema/objects/stacktrace_test.php
@@ -17,7 +17,7 @@
 namespace core\router\schema\objects;
 
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for a stacktrace.
diff --git a/lib/tests/router/schema/parameter_test.php b/lib/tests/router/schema/parameter_test.php
index a4a867e79ad..4002d888033 100644
--- a/lib/tests/router/schema/parameter_test.php
+++ b/lib/tests/router/schema/parameter_test.php
@@ -21,7 +21,7 @@ use core\router\route;
 use core\router\schema\objects\array_of_strings;
 use core\router\schema\objects\schema_object;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for parameters.
diff --git a/lib/tests/router/schema/parameters/header_object_test.php b/lib/tests/router/schema/parameters/header_object_test.php
index 627219f5b5d..69767eb5393 100644
--- a/lib/tests/router/schema/parameters/header_object_test.php
+++ b/lib/tests/router/schema/parameters/header_object_test.php
@@ -17,7 +17,7 @@
 namespace core\router\schema\parameters;
 
 use core\param;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use invalid_parameter_exception;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/lib/tests/router/schema/parameters/path_parameter_test.php b/lib/tests/router/schema/parameters/path_parameter_test.php
index b78b65eb01a..9af500c7cee 100644
--- a/lib/tests/router/schema/parameters/path_parameter_test.php
+++ b/lib/tests/router/schema/parameters/path_parameter_test.php
@@ -20,7 +20,7 @@ use core\param;
 use core\router\route;
 use core\router\schema\referenced_object;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use invalid_parameter_exception;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\Routing\RouteContext;
diff --git a/lib/tests/router/schema/parameters/query_parameter_test.php b/lib/tests/router/schema/parameters/query_parameter_test.php
index dbd66d5d052..69b03d150dc 100644
--- a/lib/tests/router/schema/parameters/query_parameter_test.php
+++ b/lib/tests/router/schema/parameters/query_parameter_test.php
@@ -20,7 +20,7 @@ use core\param;
 use core\router\route;
 use core\router\schema\referenced_object;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 
 /**
diff --git a/lib/tests/router/schema/request_body_test.php b/lib/tests/router/schema/request_body_test.php
index 32dd14933d9..212ac186a8f 100644
--- a/lib/tests/router/schema/request_body_test.php
+++ b/lib/tests/router/schema/request_body_test.php
@@ -20,7 +20,7 @@ use core\router\schema\objects\schema_object;
 use core\router\schema\response\content\json_media_type;
 use core\router\schema\response\content\payload_response_type;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 
 /**
diff --git a/lib/tests/router/schema/response/payload_response_test.php b/lib/tests/router/schema/response/payload_response_test.php
index e121a4d50e5..bada7c5eb2d 100644
--- a/lib/tests/router/schema/response/payload_response_test.php
+++ b/lib/tests/router/schema/response/payload_response_test.php
@@ -17,7 +17,7 @@
 namespace core\router\schema\response;
 
 use core\router\response_handler;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\ServerRequest;
 
diff --git a/lib/tests/router/schema/response/response_test.php b/lib/tests/router/schema/response/response_test.php
index a65490b343f..0a0a57545da 100644
--- a/lib/tests/router/schema/response/response_test.php
+++ b/lib/tests/router/schema/response/response_test.php
@@ -23,7 +23,7 @@ use core\router\schema\referenced_object;
 use core\router\schema\response\content\json_media_type;
 use core\router\schema\response\content\payload_response_type;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for the response schema definition.
diff --git a/lib/tests/router/schema/response/view_response_test.php b/lib/tests/router/schema/response/view_response_test.php
index cd15dfd6c6c..6637423cf4a 100644
--- a/lib/tests/router/schema/response/view_response_test.php
+++ b/lib/tests/router/schema/response/view_response_test.php
@@ -16,7 +16,7 @@
 
 namespace core\router\schema\response;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 
 /**
diff --git a/lib/tests/router/schema/specification_test.php b/lib/tests/router/schema/specification_test.php
index 0830fb03820..f14477b5088 100644
--- a/lib/tests/router/schema/specification_test.php
+++ b/lib/tests/router/schema/specification_test.php
@@ -22,7 +22,7 @@ use core\router\schema\parameters\path_parameter;
 use core\router\schema\response\content\payload_response_type;
 use core\router\schema\response\response;
 use core\router\schema\specification;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 
 /**
  * Tests for the specification.
diff --git a/lib/tests/router/util_test.php b/lib/tests/router/util_test.php
index 99f3c8c7b15..5a5877b5329 100644
--- a/lib/tests/router/util_test.php
+++ b/lib/tests/router/util_test.php
@@ -17,7 +17,7 @@
 namespace core\router;
 
 use core\router\middleware\moodle_route_attribute_middleware;
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\ServerRequest;
 use Slim\Middleware\RoutingMiddleware;
 
diff --git a/lib/tests/router_test.php b/lib/tests/router_test.php
index f10f19feb60..c8ccb54c7b4 100644
--- a/lib/tests/router_test.php
+++ b/lib/tests/router_test.php
@@ -16,7 +16,7 @@
 
 namespace core;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use Slim\App;
 
 /**
diff --git a/user/tests/route/api/preferences_test.php b/user/tests/route/api/preferences_test.php
index a12ec3f5ab4..5a8259bd88c 100644
--- a/user/tests/route/api/preferences_test.php
+++ b/user/tests/route/api/preferences_test.php
@@ -16,7 +16,7 @@
 
 namespace core_user\route\api;
 
-use core\tests\route_testcase;
+use core\tests\router\route_testcase;
 use GuzzleHttp\Psr7\Utils;
 
 /**