diff --git a/admin/tool/brickfield/tests/filters_test.php b/admin/tool/brickfield/tests/filters_test.php
index f68171b19b0..edb5cde5b33 100644
--- a/admin/tool/brickfield/tests/filters_test.php
+++ b/admin/tool/brickfield/tests/filters_test.php
@@ -26,7 +26,7 @@ use tool_brickfield\local\tool\filter;
  * @author     Jay Churchward (jay.churchward@poetopensource.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filter_test extends \advanced_testcase {
+class filters_test extends \advanced_testcase {
     public function test_constructor() {
         $this->resetAfterTest();
 
diff --git a/admin/tool/customlang/tests/local/mlang/langstring_test.php b/admin/tool/customlang/tests/local/mlang/langstring_test.php
index df5d99b3237..f57fd1f6b6d 100644
--- a/admin/tool/customlang/tests/local/mlang/langstring_test.php
+++ b/admin/tool/customlang/tests/local/mlang/langstring_test.php
@@ -36,7 +36,7 @@ use moodle_exception;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class langstring_testcase extends advanced_testcase {
+class langstring_test extends advanced_testcase {
 
     /**
      * Sanity 1.x string
diff --git a/admin/tool/customlang/tests/local/mlang/phpparser_test.php b/admin/tool/customlang/tests/local/mlang/phpparser_test.php
index 3dcdd934d5c..81850b611fe 100644
--- a/admin/tool/customlang/tests/local/mlang/phpparser_test.php
+++ b/admin/tool/customlang/tests/local/mlang/phpparser_test.php
@@ -34,7 +34,7 @@ use moodle_exception;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class phpparser_testcase extends advanced_testcase {
+class phpparser_test extends advanced_testcase {
 
 
     /**
diff --git a/admin/tool/moodlenet/tests/import_handler_info_test.php b/admin/tool/moodlenet/tests/import_handler_info_test.php
index 7f308c040b6..59f2db80e37 100644
--- a/admin/tool/moodlenet/tests/import_handler_info_test.php
+++ b/admin/tool/moodlenet/tests/import_handler_info_test.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_handler_info_testcase, providing test cases for the import_handler_info class.
  */
-class tool_moodlenet_import_handler_info_testcase extends \advanced_testcase {
+class import_handler_info_test extends \advanced_testcase {
 
     /**
      * Test init and the getters.
diff --git a/admin/tool/moodlenet/tests/import_handler_registry_test.php b/admin/tool/moodlenet/tests/import_handler_registry_test.php
index df7399c85a2..957f9db40aa 100644
--- a/admin/tool/moodlenet/tests/import_handler_registry_test.php
+++ b/admin/tool/moodlenet/tests/import_handler_registry_test.php
@@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_handler_registry_testcase, providing test cases for the import_handler_registry class.
  */
-class tool_moodlenet_import_handler_registry_testcase extends \advanced_testcase {
+class import_handler_registry_test extends \advanced_testcase {
 
     /**
      * Test confirming the behaviour of get_resource_handlers_for_strategy with different params.
diff --git a/admin/tool/moodlenet/tests/import_info_test.php b/admin/tool/moodlenet/tests/import_info_test.php
index 11513710c39..40731d9bdc0 100644
--- a/admin/tool/moodlenet/tests/import_info_test.php
+++ b/admin/tool/moodlenet/tests/import_info_test.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_info_testcase, providing test cases for the import_info class.
  */
-class tool_moodlenet_import_info_testcase extends \advanced_testcase {
+class import_info_test extends \advanced_testcase {
 
     /**
      * Create some test objects.
diff --git a/admin/tool/moodlenet/tests/import_processor_test.php b/admin/tool/moodlenet/tests/import_processor_test.php
index ecfcec4ef75..3721a68ca9c 100644
--- a/admin/tool/moodlenet/tests/import_processor_test.php
+++ b/admin/tool/moodlenet/tests/import_processor_test.php
@@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_processor_testcase, providing test cases for the import_processor class.
  */
-class tool_moodlenet_import_processor_testcase extends \advanced_testcase {
+class import_processor_test extends \advanced_testcase {
 
     /**
      * An integration test, this confirms the ability to construct an import processor and run the import for the current user.
diff --git a/admin/tool/moodlenet/tests/remote_resource_test.php b/admin/tool/moodlenet/tests/remote_resource_test.php
index 2e108742bf6..cafab446f3f 100644
--- a/admin/tool/moodlenet/tests/remote_resource_test.php
+++ b/admin/tool/moodlenet/tests/remote_resource_test.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_remote_resource_testcase, providing test cases for the remote_resource class.
  */
-class tool_moodlenet_remote_resource_testcase extends \advanced_testcase {
+class remote_resource_test extends \advanced_testcase {
 
     /**
      * Test getters.
diff --git a/admin/tool/moodlenet/tests/url_test.php b/admin/tool/moodlenet/tests/url_test.php
index 74a7349bec4..545e3ff5121 100644
--- a/admin/tool/moodlenet/tests/url_test.php
+++ b/admin/tool/moodlenet/tests/url_test.php
@@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_url_testcase, providing test cases for the url class.
  */
-class tool_moodlenet_url_testcase extends \advanced_testcase {
+class url_test extends \advanced_testcase {
 
     /**
      * Test the parsing to host + path components.
diff --git a/blocks/html/tests/search_content_test.php b/blocks/html/tests/search_content_test.php
index 5afb8cd60fd..5bf34fe2f4c 100644
--- a/blocks/html/tests/search_content_test.php
+++ b/blocks/html/tests/search_content_test.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright 2017 The Open University
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class search_content_testcase extends \advanced_testcase {
+class search_content_test extends \advanced_testcase {
 
     /**
      * Creates an HTML block on a course.
diff --git a/completion/tests/completion_criteria_test.php b/completion/tests/completion_criteria_test.php
index 3c648fa7dcf..d7ffaacef57 100644
--- a/completion/tests/completion_criteria_test.php
+++ b/completion/tests/completion_criteria_test.php
@@ -24,7 +24,7 @@ namespace core_completion;
  * @copyright 2021 Mikhail Golenkov <mikhailgolenkov@catalyst-au.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_completion_criteria_testcase extends \advanced_testcase {
+class completion_criteria_test extends \advanced_testcase {
 
     /**
      * Test setup.
diff --git a/contentbank/tests/content_test.php b/contentbank/tests/content_test.php
index e51f116ec1a..9161c1d8729 100644
--- a/contentbank/tests/content_test.php
+++ b/contentbank/tests/content_test.php
@@ -39,7 +39,7 @@ use contenttype_testable\contenttype as contenttype;
  * @coversDefaultClass \core_contentbank\content
  *
  */
-class core_contenttype_content_testcase extends \advanced_testcase {
+class content_test extends \advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/contentbank/tests/contenttype_test.php b/contentbank/tests/contenttype_test.php
index d3894ff21e7..11a424600a1 100644
--- a/contentbank/tests/contenttype_test.php
+++ b/contentbank/tests/contenttype_test.php
@@ -40,7 +40,7 @@ use contenttype_testable\contenttype as contenttype;
  * @coversDefaultClass \core_contentbank\contenttype
  *
  */
-class core_contenttype_contenttype_testcase extends \advanced_testcase {
+class contenttype_test extends \advanced_testcase {
 
     /** @var int Identifier for the manager role. */
     protected $managerroleid;
diff --git a/contentbank/tests/external/delete_content_test.php b/contentbank/tests/external/delete_content_test.php
index 262e7e6efc9..0e801302e18 100644
--- a/contentbank/tests/external/delete_content_test.php
+++ b/contentbank/tests/external/delete_content_test.php
@@ -43,7 +43,7 @@ use externallib_advanced_testcase;
  * @copyright  2020 Sara Arjona <sara@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class delete_content_testcase extends externallib_advanced_testcase {
+class delete_content_test extends externallib_advanced_testcase {
 
     /**
      * Test the behaviour of delete_content().
diff --git a/contentbank/tests/external/rename_content_test.php b/contentbank/tests/external/rename_content_test.php
index 889baf7ee7e..56a0cef380b 100644
--- a/contentbank/tests/external/rename_content_test.php
+++ b/contentbank/tests/external/rename_content_test.php
@@ -43,7 +43,7 @@ use external_api;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core_contentbank\external
  */
-class rename_content_testcase extends \externallib_advanced_testcase {
+class rename_content_test extends \externallib_advanced_testcase {
 
     /**
      * Data provider for test_rename_content.
diff --git a/contentbank/tests/privacy_test.php b/contentbank/tests/privacy_test.php
index 63847d6d650..09ddd0cde03 100644
--- a/contentbank/tests/privacy_test.php
+++ b/contentbank/tests/privacy_test.php
@@ -43,7 +43,7 @@ use core_privacy\local\request\approved_userlist;
  * @copyright  2020 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_contentbank_privacy_testcase extends provider_testcase {
+class privacy_test extends provider_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/course/tests/caching_content_item_readonly_repository_test.php b/course/tests/caching_content_item_readonly_repository_test.php
index aacdf544973..19eb4a75a5c 100644
--- a/course/tests/caching_content_item_readonly_repository_test.php
+++ b/course/tests/caching_content_item_readonly_repository_test.php
@@ -35,7 +35,7 @@ use core_course\local\repository\caching_content_item_readonly_repository;
  * @copyright  2020 Jake Dallimore <jrhdallimore@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class caching_content_item_readonly_repository_testcase extends \advanced_testcase {
+class caching_content_item_readonly_repository_test extends \advanced_testcase {
     /**
      * Test verifying that content items are cached and returned from the cache in subsequent same-request calls.
      */
diff --git a/course/tests/category_hooks_test.php b/course/tests/category_hooks_test.php
index 17b1fff39ca..0281a7d9994 100644
--- a/course/tests/category_hooks_test.php
+++ b/course/tests/category_hooks_test.php
@@ -35,7 +35,7 @@ use PHPUnit\Framework\MockObject\MockObject;
 /**
  * Functional test for class core_course_category methods invoking hooks.
  */
-class core_course_category_hooks_testcase extends \advanced_testcase {
+class category_hooks_test extends \advanced_testcase {
 
     protected function setUp(): void {
         $this->resetAfterTest();
diff --git a/course/tests/content_item_readonly_repository_test.php b/course/tests/content_item_readonly_repository_test.php
index d8e7998ecca..2375adcea10 100644
--- a/course/tests/content_item_readonly_repository_test.php
+++ b/course/tests/content_item_readonly_repository_test.php
@@ -35,7 +35,7 @@ use core_course\local\repository\content_item_readonly_repository;
  * @copyright  2020 Jake Dallimore <jrhdallimore@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class content_item_readonly_repository_testcase extends \advanced_testcase {
+class content_item_readonly_repository_test extends \advanced_testcase {
     /**
      * Test the repository method, find_all_for_course().
      */
diff --git a/course/tests/content_item_test.php b/course/tests/content_item_test.php
index 174529d87a1..5a2cc5920a0 100644
--- a/course/tests/content_item_test.php
+++ b/course/tests/content_item_test.php
@@ -38,7 +38,7 @@ use core_course\local\entity\string_title;
  * @copyright  2020 Jake Dallimore <jrhdallimore@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class content_item_testcase extends \advanced_testcase {
+class content_item_test extends \advanced_testcase {
 
     /**
      * Test the content_item class.
diff --git a/course/tests/course_image_cache_test.php b/course/tests/course_image_cache_test.php
index f8f98596e49..4056092e1ae 100644
--- a/course/tests/course_image_cache_test.php
+++ b/course/tests/course_image_cache_test.php
@@ -31,7 +31,7 @@ use core_course\cache\course_image;
  * @copyright  2021 Catalyst IT
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_image_cache_testcase extends \advanced_testcase {
+class course_image_cache_test extends \advanced_testcase {
 
     /**
      * Initial setup.
diff --git a/course/tests/course_summary_exporter_test.php b/course/tests/course_summary_exporter_test.php
index 7f6503d2a95..13345301d39 100644
--- a/course/tests/course_summary_exporter_test.php
+++ b/course/tests/course_summary_exporter_test.php
@@ -29,7 +29,7 @@ use context_course;
  * @copyright  2021 Catalyst IT
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_summary_exporter_testcase extends \advanced_testcase {
+class course_summary_exporter_test extends \advanced_testcase {
 
     /**
      * Test that if no course overview images uploaded get_course_image returns false.
diff --git a/course/tests/exporters_content_item_test.php b/course/tests/exporters_content_item_test.php
index 1aa2860c185..4d213e911bf 100644
--- a/course/tests/exporters_content_item_test.php
+++ b/course/tests/exporters_content_item_test.php
@@ -35,7 +35,7 @@ use core_course\local\repository\content_item_readonly_repository;
  * @copyright  2020 Jake Dallimore <jrhdallimore@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class exporters_course_content_item_testcase extends \advanced_testcase {
+class exporters_content_item_test extends \advanced_testcase {
 
     /**
      * Test confirming a content_item can be exported for a course.
diff --git a/course/tests/exporters_content_items_test.php b/course/tests/exporters_content_items_test.php
index 0e6065a8b36..42908044e62 100644
--- a/course/tests/exporters_content_items_test.php
+++ b/course/tests/exporters_content_items_test.php
@@ -35,7 +35,7 @@ use core_course\local\repository\content_item_readonly_repository;
  * @copyright  2020 Jake Dallimore <jrhdallimore@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class exporters_course_content_items_testcase extends \advanced_testcase {
+class exporters_content_items_test extends \advanced_testcase {
 
     /**
      * Test confirming the collection of content_items can be exported for a course.
diff --git a/course/tests/services_content_item_service_test.php b/course/tests/services_content_item_service_test.php
index f838265fd19..c92d79167b6 100644
--- a/course/tests/services_content_item_service_test.php
+++ b/course/tests/services_content_item_service_test.php
@@ -35,7 +35,7 @@ use \core_course\local\repository\content_item_readonly_repository;
  * @copyright  2020 Jake Dallimore <jrhdallimore@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class services_content_item_service_testcase extends \advanced_testcase {
+class services_content_item_service_test extends \advanced_testcase {
 
     /**
      * Test confirming that content items are returned by the service.
diff --git a/dataformat/pdf/tests/writer_test.php b/dataformat/pdf/tests/writer_test.php
index e1218a0639a..7cb3aca466a 100644
--- a/dataformat/pdf/tests/writer_test.php
+++ b/dataformat/pdf/tests/writer_test.php
@@ -36,7 +36,7 @@ use moodle_url;
  * @copyright  2020 Paul Holden <paulh@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class writer_testcase extends \advanced_testcase {
+class writer_test extends \advanced_testcase {
 
     /**
      * Test writing data whose content contains an image with pluginfile.php source
diff --git a/enrol/fee/tests/payment/service_provider_test.php b/enrol/fee/tests/payment/service_provider_test.php
index 80783ff8800..2bfe3c69070 100644
--- a/enrol/fee/tests/payment/service_provider_test.php
+++ b/enrol/fee/tests/payment/service_provider_test.php
@@ -30,7 +30,7 @@ namespace enrol_fee\payment;
  *
  * @coversDefaultClass service_provider
  */
-class service_provider_testcase extends \advanced_testcase {
+class service_provider_test extends \advanced_testcase {
 
     /**
      * Test for service_provider::get_payable().
diff --git a/enrol/meta/tests/external_add_instances_test.php b/enrol/meta/tests/external_add_instances_test.php
index 1e7af528ca9..ea1baa905e1 100644
--- a/enrol/meta/tests/external_add_instances_test.php
+++ b/enrol/meta/tests/external_add_instances_test.php
@@ -30,7 +30,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @copyright  2021 WKS KV Bildung
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class add_instances_testcase extends \externallib_advanced_testcase {
+class external_add_instances_test extends \externallib_advanced_testcase {
 
     /**
      * Test setup
diff --git a/enrol/meta/tests/external_delete_instances_test.php b/enrol/meta/tests/external_delete_instances_test.php
index 171d4aac2d9..58f6c47ad95 100644
--- a/enrol/meta/tests/external_delete_instances_test.php
+++ b/enrol/meta/tests/external_delete_instances_test.php
@@ -30,7 +30,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @copyright  2021 WKS KV Bildung
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class delete_instances_testcase extends \externallib_advanced_testcase {
+class external_delete_instances_test extends \externallib_advanced_testcase {
 
     /**
      * Test setup
diff --git a/files/tests/archive_writer_test.php b/files/tests/archive_writer_test.php
index 544f58e21e2..356bf62e894 100644
--- a/files/tests/archive_writer_test.php
+++ b/files/tests/archive_writer_test.php
@@ -33,7 +33,7 @@ use core_files\local\archive_writer\zip_writer;
  *
  * @coversDefaultClass \core_files\archive_writer
  */
-class archive_writer_testcase extends advanced_testcase {
+class archive_writer_test extends advanced_testcase {
 
     /**
      * Test get_file_writer().
diff --git a/files/tests/local/archive_writer/zip_writer_test.php b/files/tests/local/archive_writer/zip_writer_test.php
index 790d8d17d6d..56b56f11291 100644
--- a/files/tests/local/archive_writer/zip_writer_test.php
+++ b/files/tests/local/archive_writer/zip_writer_test.php
@@ -35,7 +35,7 @@ use ZipArchive;
  *
  * @coversDefaultClass \core_files\local\archive_writer\zip_writer
  */
-class zip_writer_testcase extends advanced_testcase {
+class zip_writer_test extends advanced_testcase {
 
     /**
      * Test add_file_from_filepath().
diff --git a/grade/grading/form/guide/tests/generator_test.php b/grade/grading/form/guide/tests/generator_test.php
index 6e07c12a1ee..dce0a7a1e5d 100644
--- a/grade/grading/form/guide/tests/generator_test.php
+++ b/grade/grading/form/guide/tests/generator_test.php
@@ -37,7 +37,7 @@ use gradingform_guide_controller;
  * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class generator_testcase extends \advanced_testcase {
+class generator_test extends \advanced_testcase {
 
     /**
      * Test guide creation.
diff --git a/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_fetch_test.php b/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_fetch_test.php
index 95132f8027d..46f62b455db 100644
--- a/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_fetch_test.php
+++ b/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_fetch_test.php
@@ -42,7 +42,7 @@ use moodle_exception;
  * @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class fetch_test extends advanced_testcase {
+class grades_grader_gradingpanel_guide_external_fetch_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_store_test.php b/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_store_test.php
index 5e428d3513a..f2bf5f33e26 100644
--- a/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_store_test.php
+++ b/grade/grading/form/guide/tests/grades_grader_gradingpanel_guide_external_store_test.php
@@ -42,7 +42,7 @@ use moodle_exception;
  * @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class store_test extends advanced_testcase {
+class grades_grader_gradingpanel_guide_external_store_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/grade/grading/form/rubric/tests/generator_test.php b/grade/grading/form/rubric/tests/generator_test.php
index 798633f3588..9d06272b546 100644
--- a/grade/grading/form/rubric/tests/generator_test.php
+++ b/grade/grading/form/rubric/tests/generator_test.php
@@ -38,7 +38,7 @@ use gradingform_controller;
  * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class generator_testcase extends advanced_testcase {
+class generator_test extends advanced_testcase {
 
     /**
      * Test rubric creation.
diff --git a/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_fetch_test.php b/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_fetch_test.php
index 2db09d99a98..42839ecb67b 100644
--- a/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_fetch_test.php
+++ b/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_fetch_test.php
@@ -43,7 +43,7 @@ use moodle_exception;
  * @copyright 2019 Mathew May <mathew.solutions>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class fetch_test extends advanced_testcase {
+class grades_grader_gradingpanel_rubric_external_fetch_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_store_test.php b/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_store_test.php
index 4d666cfda3b..ca6bfb209e7 100644
--- a/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_store_test.php
+++ b/grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_store_test.php
@@ -42,7 +42,7 @@ use moodle_exception;
  * @copyright 2019 Mathew May <mathew.solutions>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class store_test extends advanced_testcase {
+class grades_grader_gradingpanel_rubric_external_store_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/grade/grading/form/rubric/tests/privacy_test.php b/grade/grading/form/rubric/tests/privacy_test.php
index 4167dfece5e..696a91d3ca0 100644
--- a/grade/grading/form/rubric/tests/privacy_test.php
+++ b/grade/grading/form/rubric/tests/privacy_test.php
@@ -37,7 +37,7 @@ use context_module;
  * @copyright  2018 Adrian Greeve <adriangreeve.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_testcase extends provider_testcase {
+class privacy_test extends provider_testcase {
 
     /**
      * Test the export of rubric data.
diff --git a/grade/grading/tests/generator_test.php b/grade/grading/tests/generator_test.php
index 8754e3e14df..497057fc878 100644
--- a/grade/grading/tests/generator_test.php
+++ b/grade/grading/tests/generator_test.php
@@ -38,7 +38,7 @@ use gradingform_rubric_controller;
  * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class generator_testcase extends advanced_testcase {
+class generator_test extends advanced_testcase {
 
     /**
      * Test gradingform controller creation.
diff --git a/grade/tests/external/create_gradecategories_test.php b/grade/tests/external/create_gradecategories_test.php
index bde20e14bf0..433c5b06649 100644
--- a/grade/tests/external/create_gradecategories_test.php
+++ b/grade/tests/external/create_gradecategories_test.php
@@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      Moodle 3.11
  */
-class create_gradecategories_testcase extends \externallib_advanced_testcase {
+class create_gradecategories_test extends \externallib_advanced_testcase {
 
     /**
      * Test create_gradecategories.
diff --git a/grade/tests/grades_grader_gradingpanel_point_external_fetch_test.php b/grade/tests/grades_grader_gradingpanel_point_external_fetch_test.php
index 9dc2cb221ff..14104cb5e01 100644
--- a/grade/tests/grades_grader_gradingpanel_point_external_fetch_test.php
+++ b/grade/tests/grades_grader_gradingpanel_point_external_fetch_test.php
@@ -42,7 +42,7 @@ use moodle_exception;
  * @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class fetch_test extends advanced_testcase {
+class grades_grader_gradingpanel_point_external_fetch_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/grade/tests/grades_grader_gradingpanel_point_external_store_test.php b/grade/tests/grades_grader_gradingpanel_point_external_store_test.php
index 57649ab14dd..bc6a31e7b07 100644
--- a/grade/tests/grades_grader_gradingpanel_point_external_store_test.php
+++ b/grade/tests/grades_grader_gradingpanel_point_external_store_test.php
@@ -44,7 +44,7 @@ use grade_item;
  * @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class store_test extends advanced_testcase {
+class grades_grader_gradingpanel_point_external_store_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/grade/tests/grades_grader_gradingpanel_scale_external_fetch_test.php b/grade/tests/grades_grader_gradingpanel_scale_external_fetch_test.php
index 863f328109a..ffb99a299b8 100644
--- a/grade/tests/grades_grader_gradingpanel_scale_external_fetch_test.php
+++ b/grade/tests/grades_grader_gradingpanel_scale_external_fetch_test.php
@@ -42,7 +42,7 @@ use moodle_exception;
  * @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class fetch_test extends advanced_testcase {
+class grades_grader_gradingpanel_scale_external_fetch_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/grade/tests/grades_grader_gradingpanel_scale_external_store_test.php b/grade/tests/grades_grader_gradingpanel_scale_external_store_test.php
index d127ab85ebb..066ab6b5b60 100644
--- a/grade/tests/grades_grader_gradingpanel_scale_external_store_test.php
+++ b/grade/tests/grades_grader_gradingpanel_scale_external_store_test.php
@@ -44,7 +44,7 @@ use grade_item;
  * @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class store_test extends advanced_testcase {
+class grades_grader_gradingpanel_scale_external_store_test extends advanced_testcase {
 
     public static function setupBeforeClass(): void {
         global $CFG;
diff --git a/h5p/tests/generator_test.php b/h5p/tests/generator_test.php
index 8111ad07502..344847649a9 100644
--- a/h5p/tests/generator_test.php
+++ b/h5p/tests/generator_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 * @runTestsInSeparateProcesses
 */
-class generator_testcase extends \advanced_testcase {
+class generator_test extends \advanced_testcase {
 
     /**
      * Tests set up.
diff --git a/h5p/tests/h5p_core_test.php b/h5p/tests/h5p_core_test.php
index a1bcb2c6cce..355be8ca80d 100644
--- a/h5p/tests/h5p_core_test.php
+++ b/h5p/tests/h5p_core_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  *
  * @runTestsInSeparateProcesses
  */
-class h5p_core_testcase extends \advanced_testcase {
+class h5p_core_test extends \advanced_testcase {
 
     protected function setUp(): void {
         global $CFG;
diff --git a/h5p/tests/h5p_file_storage_test.php b/h5p/tests/h5p_file_storage_test.php
index d014f601de4..ef5b79ddd76 100644
--- a/h5p/tests/h5p_file_storage_test.php
+++ b/h5p/tests/h5p_file_storage_test.php
@@ -43,7 +43,7 @@ defined('MOODLE_INTERNAL') || die();
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @runTestsInSeparateProcesses
  */
-class h5p_file_storage_testcase extends \advanced_testcase {
+class h5p_file_storage_test extends \advanced_testcase {
 
     /** @var \core_h5p\file_storage H5P file storage instance */
     protected $h5p_file_storage;
diff --git a/h5p/tests/local/library/handler_test.php b/h5p/tests/local/library/handler_test.php
index 5d92f50973d..6e366d4ae2c 100644
--- a/h5p/tests/local/library/handler_test.php
+++ b/h5p/tests/local/library/handler_test.php
@@ -34,7 +34,7 @@ use advanced_testcase;
  * @copyright  2020 Sara Arjona <sara@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class handler_testcase extends advanced_testcase {
+class handler_test extends advanced_testcase {
 
     /**
      * Test the behaviour of get_h5p_string().
diff --git a/lib/form/tests/external_test.php b/lib/form/tests/external_test.php
index 3b968a2fc9f..3631a8c890e 100644
--- a/lib/form/tests/external_test.php
+++ b/lib/form/tests/external_test.php
@@ -38,7 +38,7 @@ global $CFG;
  * @copyright 2017 David Mudrak <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class external_testcase extends advanced_testcase {
+class external_test extends advanced_testcase {
 
     /**
      * Test the core_form_get_filetypes_browser_data external function
diff --git a/lib/form/tests/filetypes_util_test.php b/lib/form/tests/filetypes_util_test.php
index dc74d1d3130..26dcc80193d 100644
--- a/lib/form/tests/filetypes_util_test.php
+++ b/lib/form/tests/filetypes_util_test.php
@@ -37,7 +37,7 @@ global $CFG;
  * @copyright 2017 David Mudrak <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filetypes_util_testcase extends advanced_testcase {
+class filetypes_util_test extends advanced_testcase {
 
     /**
      * Test normalizing list of extensions.
diff --git a/lib/tests/completion_daily_task_test.php b/lib/tests/completion_daily_task_test.php
index 263b92d67af..baba7825ef7 100644
--- a/lib/tests/completion_daily_task_test.php
+++ b/lib/tests/completion_daily_task_test.php
@@ -33,7 +33,7 @@ use advanced_testcase;
  * @copyright 2020 Jun Pataleta
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_completion_cron_task_testcase extends advanced_testcase {
+class completion_daily_task_test extends advanced_testcase {
 
     /**
      * Test calendar cron task with a broken subscription URL.
diff --git a/lib/tests/dataformat_test.php b/lib/tests/dataformat_test.php
index 382c0f5dd5e..ebd10b0910a 100644
--- a/lib/tests/dataformat_test.php
+++ b/lib/tests/dataformat_test.php
@@ -35,7 +35,7 @@ use core_component;
  * @copyright  2020 Paul Holden <paulh@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class dataformat_testcase extends \advanced_testcase {
+class dataformat_test extends \advanced_testcase {
 
     /**
      * Data provider to return array of dataformat types
diff --git a/lib/tests/encryption_test.php b/lib/tests/encryption_test.php
index 81602d1472e..7fc05634885 100644
--- a/lib/tests/encryption_test.php
+++ b/lib/tests/encryption_test.php
@@ -31,7 +31,7 @@ namespace core;
  * @copyright 2020 The Open University
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class encryption_testcase extends \basic_testcase {
+class encryption_test extends \basic_testcase {
 
     /**
      * Clear junk created by tests.
diff --git a/lib/tests/event/contentbank_content_created_test.php b/lib/tests/event/contentbank_content_created_test.php
index 70a9f587aaa..90b76708045 100644
--- a/lib/tests/event/contentbank_content_created_test.php
+++ b/lib/tests/event/contentbank_content_created_test.php
@@ -34,7 +34,7 @@ namespace core\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core\event\contentbank_content_created
  */
-class contentbank_content_created_testcase extends \advanced_testcase {
+class contentbank_content_created_test extends \advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/lib/tests/event/contentbank_content_deleted_test.php b/lib/tests/event/contentbank_content_deleted_test.php
index 5604bd8fe29..4af8cc5d45e 100644
--- a/lib/tests/event/contentbank_content_deleted_test.php
+++ b/lib/tests/event/contentbank_content_deleted_test.php
@@ -34,7 +34,7 @@ namespace core\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core\event\contentbank_content_deleted
  */
-class contentbank_content_deleted_testcase extends \advanced_testcase {
+class contentbank_content_deleted_test extends \advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/lib/tests/event/contentbank_content_updated_test.php b/lib/tests/event/contentbank_content_updated_test.php
index e5fc2979683..b1a71a3def6 100644
--- a/lib/tests/event/contentbank_content_updated_test.php
+++ b/lib/tests/event/contentbank_content_updated_test.php
@@ -34,7 +34,7 @@ namespace core\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core\event\contentbank_content_updated
  */
-class contentbank_content_updated_testcase extends \advanced_testcase {
+class contentbank_content_updated_test extends \advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/lib/tests/event/contentbank_content_viewed_test.php b/lib/tests/event/contentbank_content_viewed_test.php
index e2bb7867fa2..a8f0524df44 100644
--- a/lib/tests/event/contentbank_content_viewed_test.php
+++ b/lib/tests/event/contentbank_content_viewed_test.php
@@ -34,7 +34,7 @@ namespace core\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core\event\contentbank_content_viewed
  */
-class contentbank_content_viewed_testcase extends \advanced_testcase {
+class contentbank_content_viewed_test extends \advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/lib/tests/event/grade_item_deleted_test.php b/lib/tests/event/grade_item_deleted_test.php
index baf725031e2..d1b0c160c14 100644
--- a/lib/tests/event/grade_item_deleted_test.php
+++ b/lib/tests/event/grade_item_deleted_test.php
@@ -34,7 +34,7 @@ namespace core\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core\event\grade_item_deleted
  */
-class grade_item_deleted_testcase extends \advanced_testcase {
+class grade_item_deleted_test extends \advanced_testcase {
 
     /**
      * Test the grade item deleted event.
diff --git a/lib/tests/external/dynamic_tabs_get_content_test.php b/lib/tests/external/dynamic_tabs_get_content_test.php
index ce0e779453d..02471676953 100644
--- a/lib/tests/external/dynamic_tabs_get_content_test.php
+++ b/lib/tests/external/dynamic_tabs_get_content_test.php
@@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/lib/tests/fixtures/testeable_dynamic_tab.php');
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class dynamic_tabs_get_content_testcase extends \externallib_advanced_testcase {
+class dynamic_tabs_get_content_test extends \externallib_advanced_testcase {
 
     /**
      * Text execute method
diff --git a/lib/tests/external/output/icon_system/load_fontawesome_map_test.php b/lib/tests/external/output/icon_system/load_fontawesome_map_test.php
index 752ac6c385d..5f94b7ac191 100644
--- a/lib/tests/external/output/icon_system/load_fontawesome_map_test.php
+++ b/lib/tests/external/output/icon_system/load_fontawesome_map_test.php
@@ -40,7 +40,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass core\external\output\icon_system\load_fontawesome_map
  */
-class load_fontawesome_map_testcase extends externallib_advanced_testcase {
+class load_fontawesome_map_test extends externallib_advanced_testcase {
 
     /**
      * Perform setup before these tests are run.
diff --git a/lib/tests/external/record_userfeedback_action_test.php b/lib/tests/external/record_userfeedback_action_test.php
index 12055977a49..4a4507f1f21 100644
--- a/lib/tests/external/record_userfeedback_action_test.php
+++ b/lib/tests/external/record_userfeedback_action_test.php
@@ -41,7 +41,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass record_userfeedback_action
  */
-class record_userfeedback_action_testcase extends externallib_advanced_testcase {
+class record_userfeedback_action_test extends externallib_advanced_testcase {
 
     /**
      * Data provider for test_record_userfeedback_action.
diff --git a/lib/tests/plugininfo/base_test.php b/lib/tests/plugininfo/base_test.php
index e8f55661717..fbd6ab15ca5 100644
--- a/lib/tests/plugininfo/base_test.php
+++ b/lib/tests/plugininfo/base_test.php
@@ -35,7 +35,7 @@ use testable_plugininfo_base;
 /**
  * Tests of the basic API of the plugin manager.
  */
-class base_testcase extends \advanced_testcase {
+class base_test extends \advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/lib/tests/task_running_test.php b/lib/tests/task_running_test.php
index 7aa548e54a7..378101caf82 100644
--- a/lib/tests/task_running_test.php
+++ b/lib/tests/task_running_test.php
@@ -35,7 +35,7 @@ require_once(__DIR__ . '/fixtures/task_fixtures.php');
  * @copyright 2019 The Open University
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class task_running_testcase extends \advanced_testcase {
+class task_running_test extends \advanced_testcase {
 
     /**
      * Test for ad-hoc tasks.
diff --git a/lib/xapi/tests/external/post_statement_test.php b/lib/xapi/tests/external/post_statement_test.php
index e6547a90fcd..f3986ec77db 100644
--- a/lib/xapi/tests/external/post_statement_test.php
+++ b/lib/xapi/tests/external/post_statement_test.php
@@ -48,7 +48,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class post_statement_testcase extends externallib_advanced_testcase {
+class post_statement_test extends externallib_advanced_testcase {
 
     /** @var test_helper for generating valid xapi statements. */
     private $testhelper;
diff --git a/lib/xapi/tests/handler_test.php b/lib/xapi/tests/handler_test.php
index b8b2dfcae55..7abdebf20aa 100644
--- a/lib/xapi/tests/handler_test.php
+++ b/lib/xapi/tests/handler_test.php
@@ -42,7 +42,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class handler_testcase extends advanced_testcase {
+class handler_test extends advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/lib/xapi/tests/iri_test.php b/lib/xapi/tests/iri_test.php
index 1b63d20d3aa..c90a0d1ba9d 100644
--- a/lib/xapi/tests/iri_test.php
+++ b/lib/xapi/tests/iri_test.php
@@ -35,7 +35,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class iri_testcase extends advanced_testcase {
+class iri_test extends advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/lib/xapi/tests/local/statement/item_activity_test.php b/lib/xapi/tests/local/statement/item_activity_test.php
index d8acdeca8c2..e1b7b7aed5c 100644
--- a/lib/xapi/tests/local/statement/item_activity_test.php
+++ b/lib/xapi/tests/local/statement/item_activity_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_activity_testcase extends advanced_testcase {
+class item_activity_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_actor_test.php b/lib/xapi/tests/local/statement/item_actor_test.php
index d4411df5993..eae47d5ec04 100644
--- a/lib/xapi/tests/local/statement/item_actor_test.php
+++ b/lib/xapi/tests/local/statement/item_actor_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_actor_testcase extends advanced_testcase {
+class item_actor_test extends advanced_testcase {
 
     /**
      * Test item creation with agent.
diff --git a/lib/xapi/tests/local/statement/item_agent_test.php b/lib/xapi/tests/local/statement/item_agent_test.php
index ce233b540b6..53aed334015 100644
--- a/lib/xapi/tests/local/statement/item_agent_test.php
+++ b/lib/xapi/tests/local/statement/item_agent_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_agent_testcase extends advanced_testcase {
+class item_agent_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_attachment_test.php b/lib/xapi/tests/local/statement/item_attachment_test.php
index 22483a44807..581ed8940c0 100644
--- a/lib/xapi/tests/local/statement/item_attachment_test.php
+++ b/lib/xapi/tests/local/statement/item_attachment_test.php
@@ -36,7 +36,7 @@ use core_xapi\xapi_exception;
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_attachment_testcase extends advanced_testcase {
+class item_attachment_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_context_test.php b/lib/xapi/tests/local/statement/item_context_test.php
index a12b1c5b187..d48a1da78e9 100644
--- a/lib/xapi/tests/local/statement/item_context_test.php
+++ b/lib/xapi/tests/local/statement/item_context_test.php
@@ -35,7 +35,7 @@ use core_xapi\xapi_exception;
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_context_testcase extends advanced_testcase {
+class item_context_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_definition_test.php b/lib/xapi/tests/local/statement/item_definition_test.php
index 751de2be853..92ea49b1df7 100644
--- a/lib/xapi/tests/local/statement/item_definition_test.php
+++ b/lib/xapi/tests/local/statement/item_definition_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_definition_testcase extends advanced_testcase {
+class item_definition_test extends advanced_testcase {
 
     /**
      * Test item_definition creation.
diff --git a/lib/xapi/tests/local/statement/item_group_test.php b/lib/xapi/tests/local/statement/item_group_test.php
index bd3b863cb3e..e55509009d0 100644
--- a/lib/xapi/tests/local/statement/item_group_test.php
+++ b/lib/xapi/tests/local/statement/item_group_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_group_testcase extends advanced_testcase {
+class item_group_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_object_test.php b/lib/xapi/tests/local/statement/item_object_test.php
index dc5cbae8f23..2081c884b78 100644
--- a/lib/xapi/tests/local/statement/item_object_test.php
+++ b/lib/xapi/tests/local/statement/item_object_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_object_testcase extends advanced_testcase {
+class item_object_test extends advanced_testcase {
 
     /**
      * Test item creation with agent.
diff --git a/lib/xapi/tests/local/statement/item_result_test.php b/lib/xapi/tests/local/statement/item_result_test.php
index a75ea9ff5e9..15a12127500 100644
--- a/lib/xapi/tests/local/statement/item_result_test.php
+++ b/lib/xapi/tests/local/statement/item_result_test.php
@@ -35,7 +35,7 @@ use core_xapi\xapi_exception;
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_result_testcase extends advanced_testcase {
+class item_result_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_score_test.php b/lib/xapi/tests/local/statement/item_score_test.php
index 73515e006ce..cf6e8f0d470 100644
--- a/lib/xapi/tests/local/statement/item_score_test.php
+++ b/lib/xapi/tests/local/statement/item_score_test.php
@@ -35,7 +35,7 @@ use core_xapi\xapi_exception;
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_score_testcase extends advanced_testcase {
+class item_score_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_test.php b/lib/xapi/tests/local/statement/item_test.php
index cfc8e50d7f4..b3bec363969 100644
--- a/lib/xapi/tests/local/statement/item_test.php
+++ b/lib/xapi/tests/local/statement/item_test.php
@@ -37,7 +37,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_testcase extends advanced_testcase {
+class item_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement/item_verb_test.php b/lib/xapi/tests/local/statement/item_verb_test.php
index 3c714403919..deaecfecfe0 100644
--- a/lib/xapi/tests/local/statement/item_verb_test.php
+++ b/lib/xapi/tests/local/statement/item_verb_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class item_verb_testcase extends advanced_testcase {
+class item_verb_test extends advanced_testcase {
 
     /**
      * Test item creation.
diff --git a/lib/xapi/tests/local/statement_test.php b/lib/xapi/tests/local/statement_test.php
index 84314d1af41..d1b5e47d226 100644
--- a/lib/xapi/tests/local/statement_test.php
+++ b/lib/xapi/tests/local/statement_test.php
@@ -49,7 +49,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class statement_testcase extends advanced_testcase {
+class statement_test extends advanced_testcase {
 
     /**
      * Returns a valid item for a specific attribute.
diff --git a/mod/assign/tests/custom_completion_test.php b/mod/assign/tests/custom_completion_test.php
index 0596257d3e1..91c7220eb84 100644
--- a/mod/assign/tests/custom_completion_test.php
+++ b/mod/assign/tests/custom_completion_test.php
@@ -44,7 +44,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/generator.php');
  * @copyright Simey Lameze <simey@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity_custom_completion_test extends advanced_testcase {
+class custom_completion_test extends advanced_testcase {
 
     // Use the generator helper.
     use \mod_assign_test_generator;
diff --git a/mod/assign/tests/privacy_test.php b/mod/assign/tests/privacy_test.php
index cd7edb9df40..184336bfdbd 100644
--- a/mod/assign/tests/privacy_test.php
+++ b/mod/assign/tests/privacy_test.php
@@ -40,7 +40,7 @@ use \mod_assign\privacy\provider;
  * @copyright  2018 Adrian Greeve <adrian@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_assign_privacy_testcase extends provider_testcase {
+class privacy_test extends provider_testcase {
 
     /**
      * Convenience method for creating a submission.
diff --git a/mod/choice/tests/dates_test.php b/mod/choice/tests/dates_test.php
index 0f0624a27b9..a6ff4f9e9f8 100644
--- a/mod/choice/tests/dates_test.php
+++ b/mod/choice/tests/dates_test.php
@@ -37,7 +37,7 @@ use core\activity_dates;
  * @copyright Shamim Rezaie <shamim@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class dates_testcase extends advanced_testcase {
+class dates_test extends advanced_testcase {
 
     /**
      * Data provider for get_dates_for_module().
diff --git a/mod/feedback/tests/custom_completion_test.php b/mod/feedback/tests/custom_completion_test.php
index 7d0d07ea817..3719b411588 100644
--- a/mod/feedback/tests/custom_completion_test.php
+++ b/mod/feedback/tests/custom_completion_test.php
@@ -44,7 +44,7 @@ require_once($CFG->libdir . '/completionlib.php');
  * @copyright Simey Lameze <simey@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity_custom_completion_test extends advanced_testcase {
+class custom_completion_test extends advanced_testcase {
 
     /**
      * Data provider for get_state().
diff --git a/mod/forum/tests/grades_forum_gradeitem_test.php b/mod/forum/tests/grades_forum_gradeitem_test.php
index cffa7c4bcf1..7d2b7f6da9d 100644
--- a/mod/forum/tests/grades_forum_gradeitem_test.php
+++ b/mod/forum/tests/grades_forum_gradeitem_test.php
@@ -39,7 +39,7 @@ require_once(__DIR__ . '/generator_trait.php');
  * @copyright Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class forum_gradeitem_test extends \advanced_testcase {
+class grades_forum_gradeitem_test extends \advanced_testcase {
     use \mod_forum_tests_generator_trait;
 
     /**
diff --git a/mod/forum/tests/grades_gradeitems_test.php b/mod/forum/tests/grades_gradeitems_test.php
index b68c84cf95f..9b38bb6bb42 100644
--- a/mod/forum/tests/grades_gradeitems_test.php
+++ b/mod/forum/tests/grades_gradeitems_test.php
@@ -39,7 +39,7 @@ use coding_exception;
  * @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class gradeitems_test extends advanced_testcase {
+class grades_gradeitems_test extends advanced_testcase {
 
     /**
      * Ensure that the mappings are present and correct.
diff --git a/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php b/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php
index 15142c9be91..f587a7a8a13 100644
--- a/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php
+++ b/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php
@@ -35,7 +35,7 @@ use context_module;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_module_instance_list_viewed_testcase extends advanced_testcase {
+class course_module_instance_list_viewed_test extends advanced_testcase {
 
     /**
      * Test course_module_instance_list_viewed event.
diff --git a/mod/h5pactivity/tests/event/course_module_viewed_test.php b/mod/h5pactivity/tests/event/course_module_viewed_test.php
index 4813fce93d3..8426db7dcc6 100644
--- a/mod/h5pactivity/tests/event/course_module_viewed_test.php
+++ b/mod/h5pactivity/tests/event/course_module_viewed_test.php
@@ -35,7 +35,7 @@ use context_module;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_module_viewed_testcase extends advanced_testcase {
+class course_module_viewed_test extends advanced_testcase {
 
     /**
      * Test course_module_viewed event.
diff --git a/mod/h5pactivity/tests/event/report_viewed_test.php b/mod/h5pactivity/tests/event/report_viewed_test.php
index 342580bc424..afb5703b70a 100644
--- a/mod/h5pactivity/tests/event/report_viewed_test.php
+++ b/mod/h5pactivity/tests/event/report_viewed_test.php
@@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class report_viewed_testcase extends advanced_testcase {
+class report_viewed_test extends advanced_testcase {
 
     /**
      * Test report_viewed event.
diff --git a/mod/h5pactivity/tests/event/statement_received_test.php b/mod/h5pactivity/tests/event/statement_received_test.php
index b9471406096..72439b9ff89 100644
--- a/mod/h5pactivity/tests/event/statement_received_test.php
+++ b/mod/h5pactivity/tests/event/statement_received_test.php
@@ -34,7 +34,7 @@ use context_module;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class statement_received_testcase extends advanced_testcase {
+class statement_received_test extends advanced_testcase {
 
     /**
      * Test statement_recieved event.
diff --git a/mod/h5pactivity/tests/external/get_attempts_test.php b/mod/h5pactivity/tests/external/get_attempts_test.php
index 2ada441780a..86b5a108b45 100644
--- a/mod/h5pactivity/tests/external/get_attempts_test.php
+++ b/mod/h5pactivity/tests/external/get_attempts_test.php
@@ -42,7 +42,7 @@ use externallib_advanced_testcase;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class get_attempts_testcase extends externallib_advanced_testcase {
+class get_attempts_test extends externallib_advanced_testcase {
 
     /**
      * Test the behaviour of get_attempts.
diff --git a/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php b/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php
index ac6014a60c3..3972354e4df 100644
--- a/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php
+++ b/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php
@@ -44,7 +44,7 @@ use context_module;
  * @copyright  2020 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class get_h5pactivities_by_courses_testcase extends externallib_advanced_testcase {
+class get_h5pactivities_by_courses_test extends externallib_advanced_testcase {
 
     /**
      * Test test_get_h5pactivities_by_courses user student.
diff --git a/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php b/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php
index 00c587caa5d..6f7be0dd8b3 100644
--- a/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php
+++ b/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php
@@ -42,7 +42,7 @@ use externallib_advanced_testcase;
  * @copyright  2020 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class get_h5pactivity_access_information_testcase extends externallib_advanced_testcase {
+class get_h5pactivity_access_information_test extends externallib_advanced_testcase {
 
     /**
      * Test the behaviour of get_h5pactivity_access_information().
diff --git a/mod/h5pactivity/tests/external/get_results_test.php b/mod/h5pactivity/tests/external/get_results_test.php
index 0a76597ae6f..081501e5229 100644
--- a/mod/h5pactivity/tests/external/get_results_test.php
+++ b/mod/h5pactivity/tests/external/get_results_test.php
@@ -43,7 +43,7 @@ use dml_missing_record_exception;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class get_results_testcase extends externallib_advanced_testcase {
+class get_results_test extends externallib_advanced_testcase {
 
     /**
      * Test the behaviour of get_results.
diff --git a/mod/h5pactivity/tests/external/get_user_attempts_test.php b/mod/h5pactivity/tests/external/get_user_attempts_test.php
index abc71d65209..556080035a8 100644
--- a/mod/h5pactivity/tests/external/get_user_attempts_test.php
+++ b/mod/h5pactivity/tests/external/get_user_attempts_test.php
@@ -42,7 +42,7 @@ use externallib_advanced_testcase;
  * @copyright  2020 Ilya Tregubov <ilya@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class get_user_attempts_testcase extends externallib_advanced_testcase {
+class get_user_attempts_test extends externallib_advanced_testcase {
 
     /**
      * Test the behaviour of get_user_attempts getting more than one user at once.
diff --git a/mod/h5pactivity/tests/external/view_h5pactivity_test.php b/mod/h5pactivity/tests/external/view_h5pactivity_test.php
index 09fa4ddd466..487f7538f60 100644
--- a/mod/h5pactivity/tests/external/view_h5pactivity_test.php
+++ b/mod/h5pactivity/tests/external/view_h5pactivity_test.php
@@ -45,7 +45,7 @@ use course_modinfo;
  * @copyright  2020 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class view_h5pactivity_testcase extends externallib_advanced_testcase {
+class view_h5pactivity_test extends externallib_advanced_testcase {
 
     /**
      * Test test_view_h5pactivity invalid id.
diff --git a/mod/h5pactivity/tests/local/attempt_test.php b/mod/h5pactivity/tests/local/attempt_test.php
index 2ba93798458..e4ff6b8d9a2 100644
--- a/mod/h5pactivity/tests/local/attempt_test.php
+++ b/mod/h5pactivity/tests/local/attempt_test.php
@@ -42,7 +42,7 @@ use stdClass;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class attempt_testcase extends \advanced_testcase {
+class attempt_test extends \advanced_testcase {
 
     /**
      * Generate a scenario to run all tests.
diff --git a/mod/h5pactivity/tests/local/grader_test.php b/mod/h5pactivity/tests/local/grader_test.php
index ffa97634d70..36389c0c423 100644
--- a/mod/h5pactivity/tests/local/grader_test.php
+++ b/mod/h5pactivity/tests/local/grader_test.php
@@ -36,7 +36,7 @@ use stdClass;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class grader_testcase extends \advanced_testcase {
+class grader_test extends \advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/mod/h5pactivity/tests/local/manager_test.php b/mod/h5pactivity/tests/local/manager_test.php
index c17afc7a5bf..4dba608b07d 100644
--- a/mod/h5pactivity/tests/local/manager_test.php
+++ b/mod/h5pactivity/tests/local/manager_test.php
@@ -35,7 +35,7 @@ use stdClass;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class manager_testcase extends \advanced_testcase {
+class manager_test extends \advanced_testcase {
 
     /**
      * Test for static create methods.
diff --git a/mod/h5pactivity/tests/privacy_test.php b/mod/h5pactivity/tests/privacy_test.php
index 03fd928b856..f12350349db 100644
--- a/mod/h5pactivity/tests/privacy_test.php
+++ b/mod/h5pactivity/tests/privacy_test.php
@@ -38,7 +38,7 @@ use \core_privacy\tests\provider_testcase;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_h5pactivity_privacy_testcase extends provider_testcase {
+class privacy_test extends provider_testcase {
 
     /** @var stdClass User without any attempt. */
     protected $student0;
diff --git a/mod/h5pactivity/tests/restore_test.php b/mod/h5pactivity/tests/restore_test.php
index 53dc802a7b6..6b3d7778895 100644
--- a/mod/h5pactivity/tests/restore_test.php
+++ b/mod/h5pactivity/tests/restore_test.php
@@ -41,7 +41,7 @@ use stdClass;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_h5pactivity_restore_testcase extends advanced_testcase {
+class restore_test extends advanced_testcase {
 
     /**
      * Setup to ensure that fixtures are loaded.
diff --git a/mod/h5pactivity/tests/xapi/handler_test.php b/mod/h5pactivity/tests/xapi/handler_test.php
index 43c4eba8e42..481a9383178 100644
--- a/mod/h5pactivity/tests/xapi/handler_test.php
+++ b/mod/h5pactivity/tests/xapi/handler_test.php
@@ -43,7 +43,7 @@ use stdClass;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class handler_testcase extends \advanced_testcase {
+class handler_test extends \advanced_testcase {
 
     /**
      * Generate a valid scenario for each tests.
diff --git a/mod/lti/tests/openidregistration_test.php b/mod/lti/tests/openidregistration_test.php
index 6e1a89ac4b1..dc266bc68dd 100644
--- a/mod/lti/tests/openidregistration_test.php
+++ b/mod/lti/tests/openidregistration_test.php
@@ -47,7 +47,7 @@ use mod_lti\local\ltiopenid\registration_helper;
 /**
  * OpenId LTI Registration library tests
  */
-class mod_lti_openidregistrationlib_testcase extends \advanced_testcase {
+class openidregistration_test extends \advanced_testcase {
 
     /**
      * @var string A has-it-all client registration.
diff --git a/mod/survey/tests/custom_completion_test.php b/mod/survey/tests/custom_completion_test.php
index 6457e7c563f..08b12b7cb04 100644
--- a/mod/survey/tests/custom_completion_test.php
+++ b/mod/survey/tests/custom_completion_test.php
@@ -44,7 +44,7 @@ require_once($CFG->libdir . '/completionlib.php');
  * @copyright Simey Lameze <simey@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity_custom_completion_test extends advanced_testcase {
+class custom_completion_test extends advanced_testcase {
 
     /**
      * Data provider for get_state().
diff --git a/payment/tests/generator_test.php b/payment/tests/generator_test.php
index 970d761d460..afd03dcfee7 100644
--- a/payment/tests/generator_test.php
+++ b/payment/tests/generator_test.php
@@ -33,7 +33,7 @@ namespace core_payment;
  * @copyright  2020 Marina Glancy
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class helper_testcase extends \advanced_testcase {
+class generator_test extends \advanced_testcase {
 
     public function test_create_account() {
         global $DB;
diff --git a/payment/tests/helper_test.php b/payment/tests/helper_test.php
index 8d735ab3ec1..f0700fe9ca1 100644
--- a/payment/tests/helper_test.php
+++ b/payment/tests/helper_test.php
@@ -36,7 +36,7 @@ use core\plugininfo\paygw;
  * @copyright  2020 Marina Glancy
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class accounts_testcase extends advanced_testcase {
+class helper_test extends advanced_testcase {
 
     protected function enable_paypal_gateway(): bool {
         if (!array_key_exists('paypal', \core_component::get_plugin_list('paygw'))) {
diff --git a/question/bank/comment/tests/event/comment_created_deleted_test.php b/question/bank/comment/tests/event/comment_created_deleted_test.php
index 3c6961a2802..7081381fc46 100644
--- a/question/bank/comment/tests/event/comment_created_deleted_test.php
+++ b/question/bank/comment/tests/event/comment_created_deleted_test.php
@@ -33,7 +33,7 @@ use stdClass;
  * @author     Safat Shahin <safatshahin@catalyst-au.net>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class qbank_comment_comment_created_deleted_test extends advanced_testcase {
+class comment_created_deleted_test extends advanced_testcase {
 
     /** @var stdClass Keeps course object */
     private $course;
diff --git a/question/bank/comment/tests/privacy/provider_test.php b/question/bank/comment/tests/privacy/provider_test.php
index 65cc74cb1ab..c80e4939a63 100644
--- a/question/bank/comment/tests/privacy/provider_test.php
+++ b/question/bank/comment/tests/privacy/provider_test.php
@@ -32,7 +32,7 @@ use stdClass;
  * @author     Safat Shahin <safatshahin@catalyst-au.net>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class qbank_comment_provider_test extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
 
     /** @var stdClass A teacher who is only enrolled in course1. */
     protected $teacher1;
diff --git a/question/bank/previewquestion/tests/helper_test.php b/question/bank/previewquestion/tests/helper_test.php
index 22182ca2dbd..6c4972d76cb 100644
--- a/question/bank/previewquestion/tests/helper_test.php
+++ b/question/bank/previewquestion/tests/helper_test.php
@@ -27,7 +27,7 @@ use core\plugininfo\qbank;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \qbank_previewquestion\helper
  */
-class qbank_preview_helper_test extends \advanced_testcase {
+class helper_test extends \advanced_testcase {
 
     /**
      * @var bool|\context|\context_course $context
diff --git a/question/bank/usage/tests/helper_test.php b/question/bank/usage/tests/helper_test.php
index 937cb550481..f14e14c7b6b 100644
--- a/question/bank/usage/tests/helper_test.php
+++ b/question/bank/usage/tests/helper_test.php
@@ -25,7 +25,7 @@ namespace qbank_usage;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \qbank_usage\helper
  */
-class qbank_usage_helper_test extends \advanced_testcase {
+class helper_test extends \advanced_testcase {
 
     /**
      * @var \stdClass $quiz
diff --git a/reportbuilder/tests/external/audiences/delete_test.php b/reportbuilder/tests/external/audiences/delete_test.php
index 352e12ee11e..c75ef74a830 100644
--- a/reportbuilder/tests/external/audiences/delete_test.php
+++ b/reportbuilder/tests/external/audiences/delete_test.php
@@ -39,7 +39,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php");
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class delete_testcase extends externallib_advanced_testcase {
+class delete_test extends externallib_advanced_testcase {
 
     /**
      * Text execute method
diff --git a/reportbuilder/tests/external/filters/reset_test.php b/reportbuilder/tests/external/filters/reset_test.php
index 9f5665bdd35..b0b76b4d6dc 100644
--- a/reportbuilder/tests/external/filters/reset_test.php
+++ b/reportbuilder/tests/external/filters/reset_test.php
@@ -35,7 +35,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php");
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class reset_testcase extends externallib_advanced_testcase {
+class reset_test extends externallib_advanced_testcase {
 
     /**
      * Text execute method
diff --git a/reportbuilder/tests/external/system_report_exporter_test.php b/reportbuilder/tests/external/system_report_exporter_test.php
index b0e730349bf..f8ce6f3174c 100644
--- a/reportbuilder/tests/external/system_report_exporter_test.php
+++ b/reportbuilder/tests/external/system_report_exporter_test.php
@@ -32,7 +32,7 @@ use core_reportbuilder\system_report_factory;
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class system_report_exporter_testcase extends advanced_testcase {
+class system_report_exporter_test extends advanced_testcase {
 
     /**
      * Load test fixture
diff --git a/reportbuilder/tests/local/entities/user_test.php b/reportbuilder/tests/local/entities/user_test.php
index 48107aad052..122e9189883 100644
--- a/reportbuilder/tests/local/entities/user_test.php
+++ b/reportbuilder/tests/local/entities/user_test.php
@@ -40,7 +40,7 @@ use core_reportbuilder\local\helpers\user_filter_manager;
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_testcase extends advanced_testcase {
+class user_test extends advanced_testcase {
 
     /**
      * Load required classes
diff --git a/reportbuilder/tests/local/filters/boolean_select_test.php b/reportbuilder/tests/local/filters/boolean_select_test.php
index 55f63deb883..ee28dfedc86 100644
--- a/reportbuilder/tests/local/filters/boolean_select_test.php
+++ b/reportbuilder/tests/local/filters/boolean_select_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\local\report\filter;
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class boolean_select_testcase extends advanced_testcase {
+class boolean_select_test extends advanced_testcase {
 
     /**
      * Data provider for {@see test_get_sql_filter_simple}
diff --git a/reportbuilder/tests/local/filters/course_selector_test.php b/reportbuilder/tests/local/filters/course_selector_test.php
index 155fc98454a..56da54a805e 100644
--- a/reportbuilder/tests/local/filters/course_selector_test.php
+++ b/reportbuilder/tests/local/filters/course_selector_test.php
@@ -30,7 +30,7 @@ use core_reportbuilder\local\report\filter;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class course_selector_testcase extends advanced_testcase {
+class course_selector_test extends advanced_testcase {
 
     /**
      * Test getting filter SQL
diff --git a/reportbuilder/tests/local/filters/number_test.php b/reportbuilder/tests/local/filters/number_test.php
index eb8b33dbedc..963fee2d4d1 100644
--- a/reportbuilder/tests/local/filters/number_test.php
+++ b/reportbuilder/tests/local/filters/number_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\local\report\filter;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class number_testcase extends advanced_testcase {
+class number_test extends advanced_testcase {
 
     /**
      * Data provider for {@see test_get_sql_filter_simple}
diff --git a/reportbuilder/tests/local/filters/select_test.php b/reportbuilder/tests/local/filters/select_test.php
index f0fe6567be6..2038a7bbc9f 100644
--- a/reportbuilder/tests/local/filters/select_test.php
+++ b/reportbuilder/tests/local/filters/select_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\local\report\filter;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class select_testcase extends advanced_testcase {
+class select_test extends advanced_testcase {
 
     /**
      * Data provider for {@see test_get_sql_filter_simple}
diff --git a/reportbuilder/tests/local/filters/text_test.php b/reportbuilder/tests/local/filters/text_test.php
index f16b4e0501a..2ea6e0c3723 100644
--- a/reportbuilder/tests/local/filters/text_test.php
+++ b/reportbuilder/tests/local/filters/text_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\local\report\filter;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class text_testcase extends advanced_testcase {
+class text_test extends advanced_testcase {
 
     /**
      * Data provider for {@see test_get_sql_filter_simple}
diff --git a/reportbuilder/tests/local/helpers/custom_fields_test.php b/reportbuilder/tests/local/helpers/custom_fields_test.php
index fcfcb8932a1..421afdd8f25 100644
--- a/reportbuilder/tests/local/helpers/custom_fields_test.php
+++ b/reportbuilder/tests/local/helpers/custom_fields_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\local\report\filter;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class custom_fields_testcase extends advanced_testcase {
+class custom_fields_test extends advanced_testcase {
 
     /**
      * Generate a course with customfields
diff --git a/reportbuilder/tests/local/helpers/database_test.php b/reportbuilder/tests/local/helpers/database_test.php
index 24df801539e..286c3be47ec 100644
--- a/reportbuilder/tests/local/helpers/database_test.php
+++ b/reportbuilder/tests/local/helpers/database_test.php
@@ -30,7 +30,7 @@ use core_user;
  * @copyright   2020 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class database_testcase extends advanced_testcase {
+class database_test extends advanced_testcase {
 
     /**
      * Test generating table alias and parameter names
diff --git a/reportbuilder/tests/local/helpers/format_test.php b/reportbuilder/tests/local/helpers/format_test.php
index dd45a4cdb24..ef365d08ffb 100644
--- a/reportbuilder/tests/local/helpers/format_test.php
+++ b/reportbuilder/tests/local/helpers/format_test.php
@@ -29,7 +29,7 @@ use stdClass;
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class format_testcase extends advanced_testcase {
+class format_test extends advanced_testcase {
 
     /**
      * Test userdate method
diff --git a/reportbuilder/tests/local/helpers/user_filter_manager_test.php b/reportbuilder/tests/local/helpers/user_filter_manager_test.php
index 911ab2c3355..c3049ba757d 100644
--- a/reportbuilder/tests/local/helpers/user_filter_manager_test.php
+++ b/reportbuilder/tests/local/helpers/user_filter_manager_test.php
@@ -28,7 +28,7 @@ use advanced_testcase;
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_filter_manager_testcase extends advanced_testcase {
+class user_filter_manager_test extends advanced_testcase {
 
     /**
      * Helper method to return all user preferences for filters - based on the current storage backend using the same
diff --git a/reportbuilder/tests/local/helpers/user_profile_fields_test.php b/reportbuilder/tests/local/helpers/user_profile_fields_test.php
index c73f41f470e..84807c26a69 100644
--- a/reportbuilder/tests/local/helpers/user_profile_fields_test.php
+++ b/reportbuilder/tests/local/helpers/user_profile_fields_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\local\report\filter;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_profile_fields_test_testcase extends advanced_testcase {
+class user_profile_fields_test extends advanced_testcase {
 
     /**
      * Generate userprofilefields
diff --git a/reportbuilder/tests/local/report/action_test.php b/reportbuilder/tests/local/report/action_test.php
index 428c3b65a06..c6871d4819a 100644
--- a/reportbuilder/tests/local/report/action_test.php
+++ b/reportbuilder/tests/local/report/action_test.php
@@ -31,7 +31,7 @@ use stdClass;
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class action_testcase extends advanced_testcase {
+class action_test extends advanced_testcase {
 
     /**
      * Test adding a callback that returns true
diff --git a/reportbuilder/tests/local/report/base_test.php b/reportbuilder/tests/local/report/base_test.php
index 88be3775556..adc62f9e14d 100644
--- a/reportbuilder/tests/local/report/base_test.php
+++ b/reportbuilder/tests/local/report/base_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\system_report_factory;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class base_testcase extends advanced_testcase {
+class base_test extends advanced_testcase {
 
     /**
      * Load required class
diff --git a/reportbuilder/tests/local/report/filter_test.php b/reportbuilder/tests/local/report/filter_test.php
index c3f22fa8bca..ed180b5d5a6 100644
--- a/reportbuilder/tests/local/report/filter_test.php
+++ b/reportbuilder/tests/local/report/filter_test.php
@@ -31,7 +31,7 @@ use core_reportbuilder\local\filters\text;
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filter_testcase extends advanced_testcase {
+class filter_test extends advanced_testcase {
 
     /**
      * Test getting filter class
diff --git a/reportbuilder/tests/manager_test.php b/reportbuilder/tests/manager_test.php
index 03e85bc6e3c..72476af64f5 100644
--- a/reportbuilder/tests/manager_test.php
+++ b/reportbuilder/tests/manager_test.php
@@ -32,7 +32,7 @@ use core_reportbuilder\local\report\base;
  * @copyright   2020 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class manager_testcase extends advanced_testcase {
+class manager_test extends advanced_testcase {
 
     /**
      * Test creating a report instance from persistent
diff --git a/reportbuilder/tests/system_report_factory_test.php b/reportbuilder/tests/system_report_factory_test.php
index 3adfd069ff9..96245be9cac 100644
--- a/reportbuilder/tests/system_report_factory_test.php
+++ b/reportbuilder/tests/system_report_factory_test.php
@@ -30,7 +30,7 @@ use stdClass;
  * @copyright   2020 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class system_report_factory_testcase extends advanced_testcase {
+class system_report_factory_test extends advanced_testcase {
 
     /**
      * Test creating a valid/available system report
diff --git a/reportbuilder/tests/system_report_test.php b/reportbuilder/tests/system_report_test.php
index 577749101b7..79660592d1b 100644
--- a/reportbuilder/tests/system_report_test.php
+++ b/reportbuilder/tests/system_report_test.php
@@ -30,7 +30,7 @@ use core_reportbuilder\local\report\action;
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class system_report_testcase extends advanced_testcase {
+class system_report_test extends advanced_testcase {
     /**
      * Test for actions
      */
diff --git a/repository/googledocs/tests/googledocs_search_content_test.php b/repository/googledocs/tests/googledocs_search_content_test.php
index 4862bb1b9c9..5dbedae124c 100644
--- a/repository/googledocs/tests/googledocs_search_content_test.php
+++ b/repository/googledocs/tests/googledocs_search_content_test.php
@@ -29,7 +29,7 @@ require_once($CFG->dirroot . '/repository/googledocs/lib.php');
  * @copyright  2021 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class repository_googledocs_search_testcase extends \googledocs_content_testcase {
+class googledocs_search_content_test extends \googledocs_content_testcase {
 
     /**
      * Test get_content_nodes().
diff --git a/repository/googledocs/tests/helper_test.php b/repository/googledocs/tests/helper_test.php
index 3b0b0900b7f..64c32d8ce06 100644
--- a/repository/googledocs/tests/helper_test.php
+++ b/repository/googledocs/tests/helper_test.php
@@ -29,7 +29,7 @@ require_once($CFG->dirroot . '/repository/googledocs/lib.php');
  * @copyright  2021 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class repository_googledocs_helper_testcase extends \repository_googledocs_testcase {
+class helper_test extends \repository_googledocs_testcase {
 
     /**
      * Test build_node_path().
diff --git a/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php b/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php
index 11f9763573a..ad5e43e331f 100644
--- a/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php
+++ b/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php
@@ -29,7 +29,7 @@ require_once($CFG->dirroot . '/repository/googledocs/lib.php');
  * @copyright  2021 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class repository_googledocs_drive_browser_testcase extends \googledocs_content_testcase {
+class googledocs_drive_content_test extends \googledocs_content_testcase {
 
     /**
      * Test get_content_nodes().
diff --git a/repository/googledocs/tests/local/browser/googledocs_root_content_test.php b/repository/googledocs/tests/local/browser/googledocs_root_content_test.php
index b5a2bb2112e..0ec0b70dff8 100644
--- a/repository/googledocs/tests/local/browser/googledocs_root_content_test.php
+++ b/repository/googledocs/tests/local/browser/googledocs_root_content_test.php
@@ -29,7 +29,7 @@ require_once($CFG->dirroot . '/repository/googledocs/lib.php');
  * @copyright  2021 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class repository_googledocs_root_browser_testcase extends \googledocs_content_testcase {
+class googledocs_root_content_test extends \googledocs_content_testcase {
 
     /**
      * Test get_content_nodes().
diff --git a/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php b/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php
index 1c5f388c11c..93e1fc4288b 100644
--- a/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php
+++ b/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php
@@ -29,7 +29,7 @@ require_once($CFG->dirroot . '/repository/googledocs/lib.php');
  * @copyright  2021 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class repository_googledocs_shared_drives_browser_testcase extends \googledocs_content_testcase {
+class googledocs_shared_drives_content_test extends \googledocs_content_testcase {
 
     /**
      * Test get_content_nodes().
diff --git a/repository/googledocs/tests/local/node/file_node_test.php b/repository/googledocs/tests/local/node/file_node_test.php
index 4723248e6d5..7e5d3bbf099 100644
--- a/repository/googledocs/tests/local/node/file_node_test.php
+++ b/repository/googledocs/tests/local/node/file_node_test.php
@@ -28,7 +28,7 @@ require_once($CFG->dirroot . '/repository/googledocs/tests/repository_googledocs
  * @copyright  2021 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class file_node_testcase extends \repository_googledocs_testcase {
+class file_node_test extends \repository_googledocs_testcase {
 
     /**
      * Test create_node_array().
diff --git a/repository/googledocs/tests/local/node/folder_node_test.php b/repository/googledocs/tests/local/node/folder_node_test.php
index 474da7c3630..51a2ad7a33e 100644
--- a/repository/googledocs/tests/local/node/folder_node_test.php
+++ b/repository/googledocs/tests/local/node/folder_node_test.php
@@ -28,7 +28,7 @@ require_once($CFG->dirroot . '/repository/googledocs/tests/repository_googledocs
  * @copyright  2021 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class folder_node_testcase extends \repository_googledocs_testcase {
+class folder_node_test extends \repository_googledocs_testcase {
 
     /**
      * Test create_node_array().
diff --git a/search/tests/external_test.php b/search/tests/external_test.php
index 047a9a965ae..10ab44c9ec6 100644
--- a/search/tests/external_test.php
+++ b/search/tests/external_test.php
@@ -31,7 +31,7 @@ namespace core_search;
  * @copyright 2017 The Open University
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class external_testcase extends \advanced_testcase {
+class external_test extends \advanced_testcase {
 
     public function setUp(): void {
         $this->resetAfterTest();
diff --git a/search/tests/skip_future_documents_iterator_test.php b/search/tests/skip_future_documents_iterator_test.php
index 3e9a40b49c7..50ec9ebdf1d 100644
--- a/search/tests/skip_future_documents_iterator_test.php
+++ b/search/tests/skip_future_documents_iterator_test.php
@@ -35,7 +35,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright 2017 The Open University
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class skip_future_documents_iterator_testcase extends \basic_testcase {
+class skip_future_documents_iterator_test extends \basic_testcase {
 
     /**
      * Test normal case with all documents in the past.