diff --git a/tests/phpunit/tests/admin/themeBodyClass.php b/tests/phpunit/tests/admin/themeBodyClass.php
index 4a4073521fb8c..1a4b6fd304528 100644
--- a/tests/phpunit/tests/admin/themeBodyClass.php
+++ b/tests/phpunit/tests/admin/themeBodyClass.php
@@ -3,7 +3,7 @@
 /**
  * @group admin
  */
-class Tests_Admin_Theme_Body_Class extends WP_UnitTestCase {
+class Tests_Admin_ThemeBodyClass extends WP_UnitTestCase {
 	protected static $admin_user;
 	protected $original_theme;
 
diff --git a/tests/phpunit/tests/block-bindings/postMetaSource.php b/tests/phpunit/tests/block-bindings/postMetaSource.php
index 0a305314b7869..fe555fab4eba3 100644
--- a/tests/phpunit/tests/block-bindings/postMetaSource.php
+++ b/tests/phpunit/tests/block-bindings/postMetaSource.php
@@ -9,7 +9,7 @@
  * @group blocks
  * @group block-bindings
  */
-class Tests_Block_Bindings_Post_Meta_Source extends WP_UnitTestCase {
+class Tests_BlockBindings_PostMetaSource extends WP_UnitTestCase {
 	protected static $post;
 	protected static $wp_meta_keys_saved;
 
diff --git a/tests/phpunit/tests/block-bindings/wp-block-get-block-bindings-processor.php b/tests/phpunit/tests/block-bindings/wp-block-get-block-bindings-processor.php
index afdad9bd28512..c70bab7532488 100644
--- a/tests/phpunit/tests/block-bindings/wp-block-get-block-bindings-processor.php
+++ b/tests/phpunit/tests/block-bindings/wp-block-get-block-bindings-processor.php
@@ -9,7 +9,7 @@
  * @group blocks
  * @group block-bindings
  */
-class Tests_Blocks_GetBlockBindingsProcessor extends WP_UnitTestCase {
+class Tests_BlockBindings_WpBlockGetBlockBindingsProcessor extends WP_UnitTestCase {
 
 	private static $get_block_bindings_processor_method;
 
diff --git a/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php b/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php
index 6f3e657d3e024..422bfff4b7fd5 100644
--- a/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php
+++ b/tests/phpunit/tests/block-processor/wpBlockProcessor-BlockProcessing.php
@@ -12,7 +12,7 @@
  *
  * @coversDefaultClass WP_Block_Processor
  */
-class Tests_Blocks_BlockProcessor_BlockProcessing extends WP_UnitTestCase {
+class Tests_BlockProcessor_WpBlockProcessorBlockProcessing extends WP_UnitTestCase {
 	public function test_get_breadcrumbs() {
 		$processor = new WP_Block_Processor( '<!-- wp:top --><!-- wp:inside /--><!-- /wp:top -->' );
 
diff --git a/tests/phpunit/tests/block-processor/wpBlockProcessor.php b/tests/phpunit/tests/block-processor/wpBlockProcessor.php
index 682307a88f28c..0abe50056d0f6 100644
--- a/tests/phpunit/tests/block-processor/wpBlockProcessor.php
+++ b/tests/phpunit/tests/block-processor/wpBlockProcessor.php
@@ -11,7 +11,7 @@
  *
  * @coversDefaultClass WP_Block_Processor
  */
-class Tests_Blocks_BlockProcessor extends WP_UnitTestCase {
+class Tests_BlockProcessor_WpBlockProcessor extends WP_UnitTestCase {
 	/**
 	 * Verifies that no block delimiters are found in an empty string.
 	 *
diff --git a/tests/phpunit/tests/block-supports/aria-label.php b/tests/phpunit/tests/block-supports/aria-label.php
index 087f4843cebb0..84772d22215b9 100644
--- a/tests/phpunit/tests/block-supports/aria-label.php
+++ b/tests/phpunit/tests/block-supports/aria-label.php
@@ -4,7 +4,7 @@
  *
  * @covers ::wp_apply_aria_label_support
  */
-class Tests_Block_Supports_Aria_Label extends WP_UnitTestCase {
+class Tests_BlockSupports_AriaLabel extends WP_UnitTestCase {
 	/**
 	 * @var string|null
 	 */
diff --git a/tests/phpunit/tests/block-supports/block-style-variations.php b/tests/phpunit/tests/block-supports/block-style-variations.php
index fe43f5893c812..08b0fb2266ada 100644
--- a/tests/phpunit/tests/block-supports/block-style-variations.php
+++ b/tests/phpunit/tests/block-supports/block-style-variations.php
@@ -8,7 +8,7 @@
  *
  * @group block-supports
  */
-class WP_Block_Supports_Block_Style_Variations_Test extends WP_UnitTestCase {
+class Tests_BlockSupports_BlockStyleVariations extends WP_UnitTestCase {
 	/**
 	 * Theme root directory.
 	 *
diff --git a/tests/phpunit/tests/block-supports/block-visibility.php b/tests/phpunit/tests/block-supports/block-visibility.php
index b73e8a1ede09e..61834b6ebab36 100644
--- a/tests/phpunit/tests/block-supports/block-visibility.php
+++ b/tests/phpunit/tests/block-supports/block-visibility.php
@@ -10,7 +10,7 @@
  *
  * @covers ::wp_render_block_visibility_support
  */
-class Tests_Block_Supports_Block_Visibility extends WP_UnitTestCase {
+class Tests_BlockSupports_BlockVisibility extends WP_UnitTestCase {
 	/**
 	 * @var string|null
 	 */
diff --git a/tests/phpunit/tests/block-template-utils.php b/tests/phpunit/tests/block-template-utils.php
index e5255ba5ae011..3b6c2bc233acd 100644
--- a/tests/phpunit/tests/block-template-utils.php
+++ b/tests/phpunit/tests/block-template-utils.php
@@ -6,7 +6,7 @@
  *
  * @group block-templates
  */
-class Tests_Block_Template_Utils extends WP_UnitTestCase {
+class Tests_BlockTemplateUtils extends WP_UnitTestCase {
 
 	const TEST_THEME = 'block-theme';
 
diff --git a/tests/phpunit/tests/block-template.php b/tests/phpunit/tests/block-template.php
index bb153dfea6c9a..debfa8db6a7ce 100644
--- a/tests/phpunit/tests/block-template.php
+++ b/tests/phpunit/tests/block-template.php
@@ -6,7 +6,7 @@
  *
  * @group block-templates
  */
-class Tests_Block_Template extends WP_UnitTestCase {
+class Tests_BlockTemplate extends WP_UnitTestCase {
 	private static $post;
 
 	private static $template_canvas_path = ABSPATH . WPINC . '/template-canvas.php';
diff --git a/tests/phpunit/tests/block-templates/getTemplateHierarchy.php b/tests/phpunit/tests/block-templates/getTemplateHierarchy.php
index 1a22e04aa60e7..34b1ed4bd8f16 100644
--- a/tests/phpunit/tests/block-templates/getTemplateHierarchy.php
+++ b/tests/phpunit/tests/block-templates/getTemplateHierarchy.php
@@ -6,7 +6,7 @@
  * @group block-templates
  * @covers ::get_template_hierarchy
  */
-class Tests_Block_Templates_GetTemplate_Hierarchy extends WP_Block_Templates_UnitTestCase {
+class Tests_BlockTemplates_GetTemplateHierarchy extends WP_Block_Templates_UnitTestCase {
 
 	public function set_up() {
 		parent::set_up();
diff --git a/tests/phpunit/tests/blocks/getBlockAssetUrl.php b/tests/phpunit/tests/blocks/getBlockAssetUrl.php
index ee1c541cf0c2c..c74ec5e3fe98f 100644
--- a/tests/phpunit/tests/blocks/getBlockAssetUrl.php
+++ b/tests/phpunit/tests/blocks/getBlockAssetUrl.php
@@ -10,7 +10,7 @@
  * @group blocks
  * @covers ::get_block_asset_url
  */
-class Tests_Get_Block_Asset_Url extends WP_UnitTestCase {
+class Tests_Blocks_GetBlockAssetUrl extends WP_UnitTestCase {
 	/**
 	 * Original theme directory.
 	 *
diff --git a/tests/phpunit/tests/blocks/renderCommentTemplate.php b/tests/phpunit/tests/blocks/renderCommentTemplate.php
index 4390c56a6dded..da10602699dc3 100644
--- a/tests/phpunit/tests/blocks/renderCommentTemplate.php
+++ b/tests/phpunit/tests/blocks/renderCommentTemplate.php
@@ -8,7 +8,7 @@
  *
  * @group blocks
  */
-class Tests_Blocks_RenderReusableCommentTemplate extends WP_UnitTestCase {
+class Tests_Blocks_RenderCommentTemplate extends WP_UnitTestCase {
 
 	private static $custom_post;
 	private static $comment_ids;
diff --git a/tests/phpunit/tests/build-visual-html-tree.php b/tests/phpunit/tests/build-visual-html-tree.php
index 42e35c5b74b9f..8ece7f59236ea 100644
--- a/tests/phpunit/tests/build-visual-html-tree.php
+++ b/tests/phpunit/tests/build-visual-html-tree.php
@@ -7,7 +7,7 @@
  *
  * @group testsuite
  */
-class Tests_Build_Equivalent_HTML_Semantic_Tree extends WP_UnitTestCase {
+class Tests_BuildVisualHtmlTree extends WP_UnitTestCase {
 	public function data_build_equivalent_html_semantic_tree() {
 		$block_markup = <<<END
 			<!-- wp:separator {"className":"is-style-default has-custom-classname","style":{"spacing":{"margin":{"top":"50px","bottom":"50px"}}},"backgroundColor":"accent-1"} -->
diff --git a/tests/phpunit/tests/category/walkerCategory.php b/tests/phpunit/tests/category/walkerCategory.php
index e13ce9bb1047a..f4376455e6536 100644
--- a/tests/phpunit/tests/category/walkerCategory.php
+++ b/tests/phpunit/tests/category/walkerCategory.php
@@ -6,7 +6,7 @@
  *
  * @covers Walker_Category::start_el
  */
-class Tests_Category_Walker_Category extends WP_UnitTestCase {
+class Tests_Category_WalkerCategory extends WP_UnitTestCase {
 
 	/**
 	 * @var \Walker_Category The instance of the walker.
diff --git a/tests/phpunit/tests/compat/wpCodePointCount.php b/tests/phpunit/tests/compat/wpUtf8CodePointCount.php
similarity index 100%
rename from tests/phpunit/tests/compat/wpCodePointCount.php
rename to tests/phpunit/tests/compat/wpUtf8CodePointCount.php
diff --git a/tests/phpunit/tests/customize/custom-css-setting.php b/tests/phpunit/tests/customize/custom-css-setting.php
index 65cc3f717fe59..0262fe522ddd5 100644
--- a/tests/phpunit/tests/customize/custom-css-setting.php
+++ b/tests/phpunit/tests/customize/custom-css-setting.php
@@ -6,7 +6,7 @@
  *
  * @group customize
  */
-class Test_WP_Customize_Custom_CSS_Setting extends WP_UnitTestCase {
+class Tests_Customize_CustomCssSetting extends WP_UnitTestCase {
 
 	/**
 	 * Instance of WP_Customize_Manager which is reset for each test.
diff --git a/tests/phpunit/tests/customize/nav-menu-item-setting.php b/tests/phpunit/tests/customize/nav-menu-item-setting.php
index 85cf0f10f7b5b..43c4c2a42fbb5 100644
--- a/tests/phpunit/tests/customize/nav-menu-item-setting.php
+++ b/tests/phpunit/tests/customize/nav-menu-item-setting.php
@@ -4,7 +4,7 @@
  *
  * @group customize
  */
-class Test_WP_Customize_Nav_Menu_Item_Setting extends WP_UnitTestCase {
+class Tests_Customize_NavMenuItemSetting extends WP_UnitTestCase {
 
 	/**
 	 * Instance of WP_Customize_Manager which is reset for each test.
diff --git a/tests/phpunit/tests/customize/nav-menu-setting.php b/tests/phpunit/tests/customize/nav-menu-setting.php
index 1348c86395a92..a5265888a1452 100644
--- a/tests/phpunit/tests/customize/nav-menu-setting.php
+++ b/tests/phpunit/tests/customize/nav-menu-setting.php
@@ -5,7 +5,7 @@
  *
  * @group customize
  */
-class Test_WP_Customize_Nav_Menu_Setting extends WP_UnitTestCase {
+class Tests_Customize_NavMenuSetting extends WP_UnitTestCase {
 
 	/**
 	 * Instance of WP_Customize_Manager which is reset for each test.
diff --git a/tests/phpunit/tests/customize/nav-menus.php b/tests/phpunit/tests/customize/nav-menus.php
index 65390705bad26..b84b721c65913 100644
--- a/tests/phpunit/tests/customize/nav-menus.php
+++ b/tests/phpunit/tests/customize/nav-menus.php
@@ -5,7 +5,7 @@
  *
  * @group customize
  */
-class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase {
+class Tests_Customize_NavMenus extends WP_UnitTestCase {
 
 	/**
 	 * Instance of WP_Customize_Manager which is reset for each test.
diff --git a/tests/phpunit/tests/customize/selective-refresh-ajax.php b/tests/phpunit/tests/customize/selective-refresh-ajax.php
index 8d9305962b7f7..e5fa31e2ffad8 100644
--- a/tests/phpunit/tests/customize/selective-refresh-ajax.php
+++ b/tests/phpunit/tests/customize/selective-refresh-ajax.php
@@ -12,7 +12,7 @@
  * @group customize
  * @group ajax
  */
-class Test_WP_Customize_Selective_Refresh_Ajax extends WP_UnitTestCase {
+class Tests_Customize_SelectiveRefreshAjax extends WP_UnitTestCase {
 
 	/**
 	 * Manager.
diff --git a/tests/phpunit/tests/customize/selective-refresh.php b/tests/phpunit/tests/customize/selective-refresh.php
index af2239fe60a1b..d7e01cfa607e7 100644
--- a/tests/phpunit/tests/customize/selective-refresh.php
+++ b/tests/phpunit/tests/customize/selective-refresh.php
@@ -6,7 +6,7 @@
  *
  * @group customize
  */
-class Test_WP_Customize_Selective_Refresh extends WP_UnitTestCase {
+class Tests_Customize_SelectiveRefresh extends WP_UnitTestCase {
 
 	/**
 	 * Manager.
diff --git a/tests/phpunit/tests/editor/classic-to-block-menu-converter.php b/tests/phpunit/tests/editor/classic-to-block-menu-converter.php
index f3254c537d20c..ef0a56f4a21de 100644
--- a/tests/phpunit/tests/editor/classic-to-block-menu-converter.php
+++ b/tests/phpunit/tests/editor/classic-to-block-menu-converter.php
@@ -10,7 +10,7 @@
  *
  * @group editor
  */
-class WP_Classic_To_Block_Menu_Converter_Test extends WP_UnitTestCase {
+class Tests_Editor_ClassicToBlockMenuConverter extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 58557
diff --git a/tests/phpunit/tests/editor/navigation-fallback.php b/tests/phpunit/tests/editor/navigation-fallback.php
index 36211ad08a8b9..7d783b4df0baa 100644
--- a/tests/phpunit/tests/editor/navigation-fallback.php
+++ b/tests/phpunit/tests/editor/navigation-fallback.php
@@ -10,7 +10,7 @@
  *
  * @group editor
  */
-class WP_Navigation_Fallback_Test extends WP_UnitTestCase {
+class Tests_Editor_NavigationFallback extends WP_UnitTestCase {
 
 	protected static $admin_user;
 	protected static $editor_user;
diff --git a/tests/phpunit/tests/filesystem/findFolder.php b/tests/phpunit/tests/filesystem/findFolder.php
index e2be834792212..49791c124814f 100644
--- a/tests/phpunit/tests/filesystem/findFolder.php
+++ b/tests/phpunit/tests/filesystem/findFolder.php
@@ -6,7 +6,7 @@
  * @group file
  * @group filesystem
  */
-class WP_Filesystem_Find_Folder_Test extends WP_Filesystem_UnitTestCase {
+class Tests_Filesystem_FindFolder extends WP_Filesystem_UnitTestCase {
 
 	public function test_ftp_has_root_access() {
 		global $wp_filesystem;
diff --git a/tests/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php b/tests/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php
index d10ea500e8707..856e708d3fcfc 100644
--- a/tests/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php
+++ b/tests/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php
@@ -12,7 +12,7 @@
  *
  * @covers WP_Font_Face::generate_and_print
  */
-class Tests_Fonts_WPFontFace_GenerateAndPrint extends WP_UnitTestCase {
+class Tests_Fonts_FontFace_WpFontFace_GenerateAndPrint extends WP_UnitTestCase {
 	use WP_Font_Face_Tests_Datasets;
 
 	public function test_should_not_generate_and_print_when_no_fonts() {
diff --git a/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromStyleVariations.php b/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromStyleVariations.php
index 0087dac087292..e86ede7087ff8 100644
--- a/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromStyleVariations.php
+++ b/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromStyleVariations.php
@@ -12,7 +12,7 @@
  *
  * @covers WP_Font_Face_Resolver::get_fonts_from_style_variations
  */
-class Tests_Fonts_WPFontFaceResolver_GetFontsFromStyleVariations extends WP_Font_Face_UnitTestCase {
+class Tests_Fonts_FontFace_WpFontFaceResolver_GetFontsFromStyleVariations extends WP_Font_Face_UnitTestCase {
 	const FONTS_THEME = 'fonts-block-theme';
 
 	public static function set_up_before_class() {
diff --git a/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php b/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php
index 1e48c5ae7dd59..4ffba8f51eee0 100644
--- a/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php
+++ b/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php
@@ -12,7 +12,7 @@
  *
  * @covers WP_Font_Face_Resolver::get_fonts_from_theme_json
  */
-class Tests_Fonts_WPFontFaceResolver_GetFontsFromThemeJson extends WP_Font_Face_UnitTestCase {
+class Tests_Fonts_FontFace_WpFontFaceResolver_GetFontsFromThemeJson extends WP_Font_Face_UnitTestCase {
 	const FONTS_THEME = 'fonts-block-theme';
 
 	public static function set_up_before_class() {
diff --git a/tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php b/tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php
index 2fa64559c2049..a0af8867fb2a2 100644
--- a/tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php
+++ b/tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php
@@ -12,7 +12,7 @@
  *
  * @covers wp_print_font_faces
  */
-class Tests_Fonts_WpPrintFontFaces extends WP_Font_Face_UnitTestCase {
+class Tests_Fonts_FontFace_WpPrintFontFaces extends WP_Font_Face_UnitTestCase {
 	const FONTS_THEME = 'fonts-block-theme';
 
 	public static function set_up_before_class() {
diff --git a/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php b/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php
index a59ba882a4e86..1697b01d0b483 100644
--- a/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php
+++ b/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php
@@ -12,7 +12,7 @@
  *
  * @covers wp_print_font_faces_from_style_variations
  */
-class Tests_Fonts_WpPrintFontFacesFromStyleVariations extends WP_Font_Face_UnitTestCase {
+class Tests_Fonts_FontFace_WpPrintFontFacesFromStyleVariations extends WP_Font_Face_UnitTestCase {
 	const FONTS_THEME = 'fonts-block-theme';
 
 	public static function set_up_before_class() {
diff --git a/tests/phpunit/tests/fonts/font-library/postTypes.php b/tests/phpunit/tests/fonts/font-library/postTypes.php
index 7b24163e46705..c7b6b63a912b6 100644
--- a/tests/phpunit/tests/fonts/font-library/postTypes.php
+++ b/tests/phpunit/tests/fonts/font-library/postTypes.php
@@ -8,7 +8,7 @@
  * @group fonts
  * @group font-library
  */
-class Tests_Fonts_Post_Types extends WP_UnitTestCase {
+class Tests_Fonts_FontLibrary_PostTypes extends WP_UnitTestCase {
 	/**
 	 * @ticket 41172
 	 */
diff --git a/tests/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php b/tests/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
index a0693ce341456..f9fc0f74a470b 100644
--- a/tests/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
+++ b/tests/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Collection::__construct
  */
-class Tests_Fonts_WpFontCollection_Construct extends WP_UnitTestCase {
+class Tests_Fonts_FontLibrary_WpFontCollection_Construct extends WP_UnitTestCase {
 
 	public function test_should_do_it_wrong_with_invalid_slug() {
 		$this->setExpectedIncorrectUsage( 'WP_Font_Collection::__construct' );
diff --git a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
index e01cc2c1a105a..e77235073250c 100644
--- a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
+++ b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Library::get_font_collection
  */
-class Tests_Fonts_WpFontLibrary_GetFontCollection extends WP_Font_Library_UnitTestCase {
+class Tests_Fonts_FontLibrary_WpFontLibrary_GetFontCollection extends WP_Font_Library_UnitTestCase {
 
 	public function test_should_get_font_collection() {
 		$mock_collection_data = array(
diff --git a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
index f5ca6389b8ff5..2fc139ba82c65 100644
--- a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
+++ b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Library::get_font_collections
  */
-class Tests_Fonts_WpFontLibrary_GetFontCollections extends WP_Font_Library_UnitTestCase {
+class Tests_Fonts_FontLibrary_WpFontLibrary_GetFontCollections extends WP_Font_Library_UnitTestCase {
 	public function test_should_get_an_empty_list() {
 		$font_collections = WP_Font_Library::get_instance()->get_font_collections();
 		$this->assertEmpty( $font_collections, 'Should return an empty array.' );
diff --git a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
index d3b0f126e2e7e..49ae309162027 100644
--- a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
+++ b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Library::register_font_collection
  */
-class Tests_Fonts_WpFontLibrary_RegisterFontCollection extends WP_Font_Library_UnitTestCase {
+class Tests_Fonts_FontLibrary_WpFontLibrary_RegisterFontCollection extends WP_Font_Library_UnitTestCase {
 	public function test_should_register_font_collection() {
 		$config = array(
 			'name'          => 'My Collection',
diff --git a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
index ddb0fa91c1d60..5e9f8e138d73a 100644
--- a/tests/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
+++ b/tests/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Library::unregister_font_collection
  */
-class Tests_Fonts_WpFontLibrary_UnregisterFontCollection extends WP_Font_Library_UnitTestCase {
+class Tests_Fonts_FontLibrary_WpFontLibrary_UnregisterFontCollection extends WP_Font_Library_UnitTestCase {
 
 	public function test_should_unregister_font_collection() {
 		$mock_collection_data = array(
diff --git a/tests/phpunit/tests/fonts/font-library/wpFontsDir.php b/tests/phpunit/tests/fonts/font-library/wpFontsDir.php
index 22208ca7b2e26..8dd0ff0d2f17d 100644
--- a/tests/phpunit/tests/fonts/font-library/wpFontsDir.php
+++ b/tests/phpunit/tests/fonts/font-library/wpFontsDir.php
@@ -10,7 +10,7 @@
  *
  * @covers ::wp_get_font_dir
  */
-class Tests_Fonts_WpFontDir extends WP_UnitTestCase {
+class Tests_Fonts_FontLibrary_WpFontsDir extends WP_UnitTestCase {
 	private static $dir_defaults;
 
 	public static function set_up_before_class() {
diff --git a/tests/phpunit/tests/formatting/deprecatedUtfEncodeDecode.php b/tests/phpunit/tests/formatting/deprecatedUtfEncodeDecode.php
index 319890c457701..a7051990e62ff 100644
--- a/tests/phpunit/tests/formatting/deprecatedUtfEncodeDecode.php
+++ b/tests/phpunit/tests/formatting/deprecatedUtfEncodeDecode.php
@@ -3,7 +3,7 @@
 /**
  * @group formatting
  */
-class Tests_DeprecatedUtf8EncodeDecodeTest extends WP_UnitTestCase {
+class Tests_Formatting_DeprecatedUTFEncodeDecode extends WP_UnitTestCase {
 	/**
 	 * Ensures that the fallback for {@see \utf8_encode()} maps the ISO-8859-1 characters properly.
 	 *
diff --git a/tests/phpunit/tests/functions/isNewDay.php b/tests/phpunit/tests/functions/isNewDay.php
index 27c9b5232fe4c..369e85912d241 100644
--- a/tests/phpunit/tests/functions/isNewDay.php
+++ b/tests/phpunit/tests/functions/isNewDay.php
@@ -8,7 +8,7 @@
  *
  * @covers ::is_new_day
  */
-class Tests_Functions_IsNewDate extends WP_UnitTestCase {
+class Tests_Functions_IsNewDay extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 46627
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php b/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php
index 094fea367878a..34399e9b60a76 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php
@@ -11,7 +11,7 @@
  *
  * @coversDefaultClass WP_HTML_Processor
  */
-class Tests_HtmlApi_WpHtmlProcessor_Bookmark extends WP_UnitTestCase {
+class Tests_HtmlApi_WpHtmlProcessorBookmark extends WP_UnitTestCase {
 	/**
 	 * @dataProvider data_processor_constructors
 	 *
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php b/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php
index e2b5a79c2de2f..b1c541f60068d 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php
@@ -13,7 +13,7 @@
  *
  * @coversDefaultClass WP_HTML_Processor
  */
-class Tests_HtmlApi_WpHtmlProcessor_Serialize extends WP_UnitTestCase {
+class Tests_HtmlApi_WpHtmlProcessorSerialize extends WP_UnitTestCase {
 	/**
 	 * Ensures that basic text is properly encoded when serialized.
 	 *
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php b/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php
index a03a9ab806a93..b3fad70e70100 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php
@@ -20,7 +20,7 @@
  * @group html-api
  * @group html-api-html5lib-tests
  */
-class Tests_HtmlApi_Html5lib extends WP_UnitTestCase {
+class Tests_HtmlApi_WpHtmlProcessorHtml5lib extends WP_UnitTestCase {
 	const TREE_INDENT = '  ';
 
 	/**
diff --git a/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php b/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php
index 0e72f9d726835..9bc913e9a74f8 100644
--- a/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php
+++ b/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php
@@ -11,7 +11,7 @@
  *
  * @coversDefaultClass WP_HTML_Tag_Processor
  */
-class Tests_HtmlApi_WpHtmlTagProcessor_Bookmark extends WP_UnitTestCase {
+class Tests_HtmlApi_WpHtmlTagProcessorBookmark extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 56299
diff --git a/tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php b/tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php
index e8195dcfa28c6..c964a04598f65 100644
--- a/tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php
+++ b/tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php
@@ -11,7 +11,7 @@
  *
  * @coversDefaultClass WP_HTML_Tag_Processor
  */
-class Tests_HtmlApi_WpHtmlProcessor_Token_Scanning extends WP_UnitTestCase {
+class Tests_HtmlApi_WpHtmlTagProcessorTokenScanning extends WP_UnitTestCase {
 	/**
 	 * Ensures that scanning finishes in a complete form when the document is empty.
 	 *
diff --git a/tests/phpunit/tests/https-detection.php b/tests/phpunit/tests/https-detection.php
index a425878ab114f..1dd1c199a3dc3 100644
--- a/tests/phpunit/tests/https-detection.php
+++ b/tests/phpunit/tests/https-detection.php
@@ -3,7 +3,7 @@
 /**
  * @group https-detection
  */
-class Tests_HTTPS_Detection extends WP_UnitTestCase {
+class Tests_HTTPSDetection extends WP_UnitTestCase {
 
 	private $last_request_url;
 
diff --git a/tests/phpunit/tests/https-migration.php b/tests/phpunit/tests/https-migration.php
index ae66738603e13..e3f8c7f8d51be 100644
--- a/tests/phpunit/tests/https-migration.php
+++ b/tests/phpunit/tests/https-migration.php
@@ -3,7 +3,7 @@
 /**
  * @group https-migration
  */
-class Tests_HTTPS_Migration extends WP_UnitTestCase {
+class Tests_HTTPSMigration extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 51437
diff --git a/tests/phpunit/tests/image/editorGd.php b/tests/phpunit/tests/image/editorGd.php
index ac0e8268390c2..126bafbd53c3b 100644
--- a/tests/phpunit/tests/image/editorGd.php
+++ b/tests/phpunit/tests/image/editorGd.php
@@ -9,7 +9,7 @@
  */
 require_once __DIR__ . '/base.php';
 
-class Tests_Image_Editor_GD extends WP_Image_UnitTestCase {
+class Tests_Image_EditorGd extends WP_Image_UnitTestCase {
 
 	public $editor_engine = 'WP_Image_Editor_GD';
 
diff --git a/tests/phpunit/tests/image/editorImagick.php b/tests/phpunit/tests/image/editorImagick.php
index 5816cc6b5a6d9..f6699759c4428 100644
--- a/tests/phpunit/tests/image/editorImagick.php
+++ b/tests/phpunit/tests/image/editorImagick.php
@@ -9,7 +9,7 @@
  */
 require_once __DIR__ . '/base.php';
 
-class Tests_Image_Editor_Imagick extends WP_Image_UnitTestCase {
+class Tests_Image_EditorImagick extends WP_Image_UnitTestCase {
 
 	public $editor_engine = 'WP_Image_Editor_Imagick';
 
diff --git a/tests/phpunit/tests/image/intermediateSize.php b/tests/phpunit/tests/image/intermediateSize.php
index 65564a70e5edd..4a71b16a200ef 100644
--- a/tests/phpunit/tests/image/intermediateSize.php
+++ b/tests/phpunit/tests/image/intermediateSize.php
@@ -4,7 +4,7 @@
  * @group media
  * @group upload
  */
-class Tests_Image_Intermediate_Size extends WP_UnitTestCase {
+class Tests_Image_IntermediateSize extends WP_UnitTestCase {
 	public function tear_down() {
 		$this->remove_added_uploads();
 
diff --git a/tests/phpunit/tests/image/resizeGd.php b/tests/phpunit/tests/image/resizeGd.php
index 7a7e9caec8945..7d31084ccd686 100644
--- a/tests/phpunit/tests/image/resizeGd.php
+++ b/tests/phpunit/tests/image/resizeGd.php
@@ -11,7 +11,7 @@
  */
 require_once __DIR__ . '/resize.php';
 
-class Test_Image_Resize_GD extends WP_Tests_Image_Resize_UnitTestCase {
+class Tests_Image_ResizeGd extends WP_Tests_Image_Resize_UnitTestCase {
 
 	/**
 	 * Use the GD image editor engine
diff --git a/tests/phpunit/tests/image/resizeImagick.php b/tests/phpunit/tests/image/resizeImagick.php
index 51ebc2b6dd919..38f905dd100e6 100644
--- a/tests/phpunit/tests/image/resizeImagick.php
+++ b/tests/phpunit/tests/image/resizeImagick.php
@@ -9,7 +9,7 @@
  */
 require_once __DIR__ . '/resize.php';
 
-class Test_Image_Resize_Imagick extends WP_Tests_Image_Resize_UnitTestCase {
+class Tests_Image_ResizeImagick extends WP_Tests_Image_Resize_UnitTestCase {
 
 	/**
 	 * Use the Imagick image editor engine
diff --git a/tests/phpunit/tests/image/siteIcon.php b/tests/phpunit/tests/image/siteIcon.php
index 4927c1b4ffc3f..5bdd4eb2b6f68 100644
--- a/tests/phpunit/tests/image/siteIcon.php
+++ b/tests/phpunit/tests/image/siteIcon.php
@@ -7,7 +7,7 @@
 
 require_once ABSPATH . 'wp-admin/includes/class-wp-site-icon.php';
 
-class Tests_WP_Site_Icon extends WP_UnitTestCase {
+class Tests_Image_SiteIcon extends WP_UnitTestCase {
 	protected $wp_site_icon;
 
 	public $attachment_id = 0;
diff --git a/tests/phpunit/tests/includes/factory.php b/tests/phpunit/tests/includes/factory.php
index 98ab3f02e306a..f9bacb733bdd9 100644
--- a/tests/phpunit/tests/includes/factory.php
+++ b/tests/phpunit/tests/includes/factory.php
@@ -1,6 +1,6 @@
 <?php
 
-class TestFactoryFor extends WP_UnitTestCase {
+class Tests_Includes_Factory extends WP_UnitTestCase {
 
 	/**
 	 * @var WP_UnitTest_Factory_For_Term
diff --git a/tests/phpunit/tests/includes/helpers.php b/tests/phpunit/tests/includes/helpers.php
index 5b9b83f463f94..08b9c415281c1 100644
--- a/tests/phpunit/tests/includes/helpers.php
+++ b/tests/phpunit/tests/includes/helpers.php
@@ -3,7 +3,7 @@
 /**
  * @group phpunit
  */
-class Tests_TestHelpers extends WP_UnitTestCase {
+class Tests_Includes_Helpers extends WP_UnitTestCase {
 	/**
 	 * @ticket 30522
 	 */
@@ -234,7 +234,7 @@ public function test__unregister_post_status() {
 	 * @ticket 28486
 	 */
 	public function test_setExpectedDeprecated() {
-		$this->setExpectedDeprecated( 'Tests_TestHelpers::mock_deprecated' );
+		$this->setExpectedDeprecated( __CLASS__ . '::mock_incorrect_usage' );
 		$this->assertTrue( $this->mock_deprecated() );
 	}
 
@@ -242,7 +242,7 @@ public function test_setExpectedDeprecated() {
 	 * @ticket 28486
 	 */
 	public function test_setExpectedIncorrectUsage() {
-		$this->setExpectedIncorrectUsage( 'Tests_TestHelpers::mock_incorrect_usage' );
+		$this->setExpectedIncorrectUsage( __CLASS__ . '::mock_incorrect_usage' );
 		$this->assertTrue( $this->mock_incorrect_usage() );
 	}
 
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
index cd3f17c8ae254..79c8658352ccc 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-bind.php
@@ -12,7 +12,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Bind extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpBind extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
index 72162a3c684ef..2d2d0c45bed79 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-class.php
@@ -12,7 +12,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Class extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpClass extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
index 9685a3f979cd9..a289f69ca6aca 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-context.php
@@ -12,7 +12,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Context extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpContext extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
index 1b2290f96560d..2efb780b5f0b8 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-each.php
@@ -10,7 +10,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Each extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpEach extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
index c1f3b9c8d2ae2..13e29fa4372ca 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-interactive.php
@@ -12,7 +12,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Interactive extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpInteractive extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
index d6deab48ab141..113942dd6f5d4 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php
@@ -10,7 +10,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Router_Region extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpRouterRegion extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
index 1a5884f34b8e6..7c332e0698cf3 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-style.php
@@ -12,7 +12,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Style extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpStyle extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
index 988dce96b77c2..33f16740402d6 100644
--- a/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
+++ b/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-text.php
@@ -12,7 +12,7 @@
  *
  * @group interactivity-api
  */
-class Tests_WP_Interactivity_API_WP_Text extends WP_UnitTestCase {
+class Tests_InteractivityApi_WpInteractivityAPIWpText extends WP_UnitTestCase {
 	/**
 	 * Instance of WP_Interactivity_API.
 	 *
diff --git a/tests/phpunit/tests/js-interop.php b/tests/phpunit/tests/js-interop.php
index 91b6a1a95045c..066b91e0ff881 100644
--- a/tests/phpunit/tests/js-interop.php
+++ b/tests/phpunit/tests/js-interop.php
@@ -5,7 +5,7 @@
  * @package WordPress
  * @group js-interop
  */
-class Tests_JS_Interop extends WP_UnitTestCase {
+class Tests_JsInterop extends WP_UnitTestCase {
 	/**
 	 * Ensures proper recognition of a data attribute and how to transform its
 	 * name into what JavaScript code would read from an element's `dataset`.
diff --git a/tests/phpunit/tests/l10n/phpmailerTranslations.php b/tests/phpunit/tests/l10n/phpmailerTranslations.php
index 15e8dcd9dac04..75913a1d86220 100644
--- a/tests/phpunit/tests/l10n/phpmailerTranslations.php
+++ b/tests/phpunit/tests/l10n/phpmailerTranslations.php
@@ -18,7 +18,7 @@
  *
  * @since 6.8.0
  */
-class Test_PHPMailer_Translations extends WP_UnitTestCase {
+class Tests_L10n_PhpmailerTranslations extends WP_UnitTestCase {
 	/**
 	 * Tests that PHPMailer error message translation works as expected.
 	 *
diff --git a/tests/phpunit/tests/l10n/wpTranslationController.php b/tests/phpunit/tests/l10n/wpTranslationController.php
index 00afeaa095cea..6776ca2c97aeb 100644
--- a/tests/phpunit/tests/l10n/wpTranslationController.php
+++ b/tests/phpunit/tests/l10n/wpTranslationController.php
@@ -4,7 +4,7 @@
  * @group l10n
  * @group i18n
  */
-class WP_Translation_Controller_Tests extends WP_UnitTestCase {
+class Tests_L10n_WpTranslationController extends WP_UnitTestCase {
 	public function tear_down() {
 		remove_all_filters( 'translation_file_format' );
 		unload_textdomain( 'wp-tests-domain' );
diff --git a/tests/phpunit/tests/l10n/wpTranslations.php b/tests/phpunit/tests/l10n/wpTranslations.php
index fce1ce438bcd2..98261408524cc 100644
--- a/tests/phpunit/tests/l10n/wpTranslations.php
+++ b/tests/phpunit/tests/l10n/wpTranslations.php
@@ -5,7 +5,7 @@
  * @group l10n
  * @group i18n
  */
-class WP_Translations_Tests extends WP_UnitTestCase {
+class Tests_L10n_WpTranslations extends WP_UnitTestCase {
 	public function tear_down() {
 		unload_textdomain( 'wp-tests-domain' );
 
diff --git a/tests/phpunit/tests/l10n/wpTranslationsConvert.php b/tests/phpunit/tests/l10n/wpTranslationsConvert.php
index 564857b041a48..bb100fdb39a2e 100644
--- a/tests/phpunit/tests/l10n/wpTranslationsConvert.php
+++ b/tests/phpunit/tests/l10n/wpTranslationsConvert.php
@@ -5,7 +5,7 @@
  * @group l10n
  * @group i18n
  */
-class WP_Translation_Controller_Convert_Tests extends WP_UnitTestCase {
+class Tests_L10n_WpTranslationsConvert extends WP_UnitTestCase {
 	/**
 	 * @covers ::instance
 	 */
diff --git a/tests/phpunit/tests/load/wpDebugMode.php b/tests/phpunit/tests/load/wpDebugMode.php
index a63f161369555..5e78cfc474394 100644
--- a/tests/phpunit/tests/load/wpDebugMode.php
+++ b/tests/phpunit/tests/load/wpDebugMode.php
@@ -12,7 +12,7 @@
  *
  * @covers ::wp_debug_mode
  */
-class Test_WP_Debug_Mode extends WP_UnitTestCase {
+class Tests_Load_WpDebugMode extends WP_UnitTestCase {
 	/**
 	 * Test: `wp_debug_mode()` should log, but not display, errors for `ms-files.php`.
 	 *
diff --git a/tests/phpunit/tests/load/wpGetDevelopmentMode.php b/tests/phpunit/tests/load/wpGetDevelopmentMode.php
index ad5ef32176c27..2bc04c9224a38 100644
--- a/tests/phpunit/tests/load/wpGetDevelopmentMode.php
+++ b/tests/phpunit/tests/load/wpGetDevelopmentMode.php
@@ -11,7 +11,7 @@
  * @covers ::wp_get_development_mode
  * @covers ::wp_is_development_mode
  */
-class Test_WP_Get_Development_Mode extends WP_UnitTestCase {
+class Tests_Load_WpGetDevelopmentMode extends WP_UnitTestCase {
 
 	/**
 	 * Tests that `wp_get_development_mode()` returns the value of the `WP_DEVELOPMENT_MODE` constant.
diff --git a/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php b/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php
index 15e1859084a03..2f6f80294164d 100644
--- a/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php
+++ b/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php
@@ -6,7 +6,7 @@
  * @group media
  * @covers ::wp_img_tag_add_decoding_attr
  */
-class Tests_Media_Wp_Img_Tag_Add_Decoding_Attr extends WP_UnitTestCase {
+class Tests_Media_WpImageTagAddDecodingAttr extends WP_UnitTestCase {
 	/**
 	 * Tests that the `wp_img_tag_add_decoding_attr()` function should add
 	 * the 'decoding' attribute.
diff --git a/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php b/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php
index 84bfc7cc7e119..6d13973bbaac8 100644
--- a/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php
+++ b/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php
@@ -6,7 +6,7 @@
  * @group media
  * @covers ::wp_img_tag_add_width_and_height_attr
  */
-class Tests_Media_Wp_Img_Tag_Add_Width_And_Height_Attr extends WP_UnitTestCase {
+class Tests_Media_WpImgTagAddWidthAndHeightAttr extends WP_UnitTestCase {
 
 	protected static $attachment_id;
 	protected static $attachment_width;
diff --git a/tests/phpunit/tests/media/wpPlaylistShortcode.php b/tests/phpunit/tests/media/wpPlaylistShortcode.php
index 146b13a8e66b5..9288e2132c65f 100644
--- a/tests/phpunit/tests/media/wpPlaylistShortcode.php
+++ b/tests/phpunit/tests/media/wpPlaylistShortcode.php
@@ -3,7 +3,7 @@
  * @group media
  * @covers ::wp_playlist_shortcode
  */
-class Tests_Media_Wp_Playlist_Shortcode extends WP_UnitTestCase {
+class Tests_Media_WpPlaylistShortcode extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 63583
diff --git a/tests/phpunit/tests/menu/nav-menu.php b/tests/phpunit/tests/menu/nav-menu.php
index fcd3a3ac1059c..47a6492395504 100644
--- a/tests/phpunit/tests/menu/nav-menu.php
+++ b/tests/phpunit/tests/menu/nav-menu.php
@@ -3,7 +3,7 @@
 /**
  * @group menu
  */
-class Tests_Nav_Menu_Theme_Change extends WP_UnitTestCase {
+class Tests_Menu_NavMenu extends WP_UnitTestCase {
 
 	/**
 	 * Set up.
diff --git a/tests/phpunit/tests/menu/walker-nav-menu-edit.php b/tests/phpunit/tests/menu/walker-nav-menu-edit.php
index 0df5531975652..58a741dee79ac 100644
--- a/tests/phpunit/tests/menu/walker-nav-menu-edit.php
+++ b/tests/phpunit/tests/menu/walker-nav-menu-edit.php
@@ -4,7 +4,7 @@
  * @group menu
  * @group walker
  */
-class Tests_Menu_Walker_Nav_Menu_Edit extends WP_UnitTestCase {
+class Tests_Menu_WalkerNavMenuEdit extends WP_UnitTestCase {
 
 	/**
 	 * @var \Walker_Nav_Menu_Edit
diff --git a/tests/phpunit/tests/menu/walker-nav-menu.php b/tests/phpunit/tests/menu/walker-nav-menu.php
index 58a54088b390c..ce7c4dc8857ca 100644
--- a/tests/phpunit/tests/menu/walker-nav-menu.php
+++ b/tests/phpunit/tests/menu/walker-nav-menu.php
@@ -3,7 +3,7 @@
  * @group menu
  * @group walker
  */
-class Tests_Menu_Walker_Nav_Menu extends WP_UnitTestCase {
+class Tests_Menu_WalkerNavMenu extends WP_UnitTestCase {
 
 	/**
 	 * @var \Walker_Nav_Menu The instance of the walker.
diff --git a/tests/phpunit/tests/menu/wp-nav-menu.php b/tests/phpunit/tests/menu/wp-nav-menu.php
index 72f5932ad0bbe..430f368b2a834 100644
--- a/tests/phpunit/tests/menu/wp-nav-menu.php
+++ b/tests/phpunit/tests/menu/wp-nav-menu.php
@@ -5,7 +5,7 @@
  *
  * @covers ::wp_nav_menu
  */
-class Tests_Menu_wpNavMenu extends WP_UnitTestCase {
+class Tests_Menu_WpNavMenu extends WP_UnitTestCase {
 
 	private static $menu_id        = 0;
 	private static $lvl0_menu_item = 0;
diff --git a/tests/phpunit/tests/meta/registerMeta.php b/tests/phpunit/tests/meta/registerMeta.php
index 30b6920bdea0d..e62c6a3a732cf 100644
--- a/tests/phpunit/tests/meta/registerMeta.php
+++ b/tests/phpunit/tests/meta/registerMeta.php
@@ -2,7 +2,7 @@
 /**
  * @group meta
  */
-class Tests_Meta_Register_Meta extends WP_UnitTestCase {
+class Tests_Meta_RegisterMeta extends WP_UnitTestCase {
 
 	protected static $post_id;
 	protected static $term_id;
diff --git a/tests/phpunit/tests/oembed/WpEmbed.php b/tests/phpunit/tests/oembed/WpEmbed.php
index c7b0649867d97..c55ae0946a235 100644
--- a/tests/phpunit/tests/oembed/WpEmbed.php
+++ b/tests/phpunit/tests/oembed/WpEmbed.php
@@ -3,7 +3,7 @@
 /**
  * @group oembed
  */
-class Tests_WP_Embed extends WP_UnitTestCase {
+class Tests_oEmbed_WpEmbed extends WP_UnitTestCase {
 	/**
 	 * @var WP_Embed
 	 */
diff --git a/tests/phpunit/tests/oembed/filterResult.php b/tests/phpunit/tests/oembed/filterResult.php
index 10dbe0e4ea017..106c1365df85f 100644
--- a/tests/phpunit/tests/oembed/filterResult.php
+++ b/tests/phpunit/tests/oembed/filterResult.php
@@ -3,7 +3,7 @@
 /**
  * @group oembed
  */
-class Tests_Filter_oEmbed_Result extends WP_UnitTestCase {
+class Tests_oEmbed_FilterResult extends WP_UnitTestCase {
 	public function test_filter_oembed_result_trusted_malicious_iframe() {
 		$html = '<p></p><iframe onload="alert(1)"></iframe>';
 
diff --git a/tests/phpunit/tests/oembed/filterTitleAttributes.php b/tests/phpunit/tests/oembed/filterTitleAttributes.php
index 29d22f838af79..6befa016d7135 100644
--- a/tests/phpunit/tests/oembed/filterTitleAttributes.php
+++ b/tests/phpunit/tests/oembed/filterTitleAttributes.php
@@ -3,7 +3,7 @@
 /**
  * @group oembed
  */
-class Tests_Filter_oEmbed_Iframe_Title_Attribute extends WP_UnitTestCase {
+class Tests_oEmbed_FilterTitleAttributes extends WP_UnitTestCase {
 	public function data_filter_oembed_iframe_title_attribute() {
 		return array(
 			array(
diff --git a/tests/phpunit/tests/oembed/getResponseData.php b/tests/phpunit/tests/oembed/getResponseData.php
index 09a0f3142b319..d5d7c1007d8cb 100644
--- a/tests/phpunit/tests/oembed/getResponseData.php
+++ b/tests/phpunit/tests/oembed/getResponseData.php
@@ -4,7 +4,7 @@
  * @group oembed
  * @covers ::get_oembed_response_data
  */
-class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
+class Tests_oEmbed_GetResponseData extends WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
diff --git a/tests/phpunit/tests/oembed/postEmbedUrl.php b/tests/phpunit/tests/oembed/postEmbedUrl.php
index ed674b8429c38..c365b74219b1e 100644
--- a/tests/phpunit/tests/oembed/postEmbedUrl.php
+++ b/tests/phpunit/tests/oembed/postEmbedUrl.php
@@ -3,7 +3,7 @@
 /**
  * @group oembed
  */
-class Tests_Post_Embed_URL extends WP_UnitTestCase {
+class Tests_oEmbed_PostEmbedUrl extends WP_UnitTestCase {
 	public function test_non_existent_post() {
 		$embed_url = get_post_embed_url( 0 );
 		$this->assertFalse( $embed_url );
diff --git a/tests/phpunit/tests/oembed/wpOembed.php b/tests/phpunit/tests/oembed/wpOembed.php
index 76d733dbce2e0..fa0f8fa943bae 100644
--- a/tests/phpunit/tests/oembed/wpOembed.php
+++ b/tests/phpunit/tests/oembed/wpOembed.php
@@ -3,7 +3,7 @@
 /**
  * @group oembed
  */
-class Tests_WP_oEmbed extends WP_UnitTestCase {
+class Tests_oEmbed_WPoEmbed extends WP_UnitTestCase {
 	/**
 	 * @var WP_oEmbed
 	 */
diff --git a/tests/phpunit/tests/option/wpDetermineOptionAutoloadValue.php b/tests/phpunit/tests/option/wpDetermineOptionAutoloadValue.php
index 4b88e0138a4a4..a89dabdd1c2f0 100644
--- a/tests/phpunit/tests/option/wpDetermineOptionAutoloadValue.php
+++ b/tests/phpunit/tests/option/wpDetermineOptionAutoloadValue.php
@@ -5,7 +5,7 @@
  *
  * @covers ::wp_determine_option_autoload_value
  */
-class Tests_WP_Determine_Option_Autoload_Value extends WP_UnitTestCase {
+class Tests_Option_WpDetermineOptionAutoloadValue extends WP_UnitTestCase {
 	public function set_up() {
 		add_filter( 'wp_max_autoloaded_option_size', array( $this, 'filter_max_option_size' ) );
 		parent::set_up();
diff --git a/tests/phpunit/tests/pomo/pluralForms.php b/tests/phpunit/tests/pomo/pluralForms.php
index b676735c59bac..1dcfa3a20dbb5 100644
--- a/tests/phpunit/tests/pomo/pluralForms.php
+++ b/tests/phpunit/tests/pomo/pluralForms.php
@@ -3,7 +3,7 @@
 /**
  * @group pomo
  */
-class PluralFormsTest extends WP_UnitTestCase {
+class Tests_Pomo_PluralForms extends WP_UnitTestCase {
 	/**
 	 * Parenthesize plural expression.
 	 *
diff --git a/tests/phpunit/tests/post/nav-menu.php b/tests/phpunit/tests/post/nav-menu.php
index d4ece1ff1776c..27018ac131f96 100644
--- a/tests/phpunit/tests/post/nav-menu.php
+++ b/tests/phpunit/tests/post/nav-menu.php
@@ -3,7 +3,7 @@
  * @group post
  * @group menu
  */
-class Tests_Post_Nav_Menu extends WP_UnitTestCase {
+class Tests_Post_NavMenu extends WP_UnitTestCase {
 	/**
 	 * @var int
 	 */
diff --git a/tests/phpunit/tests/post/primePostParentsCaches.php b/tests/phpunit/tests/post/primePostParentIdCaches.php
similarity index 100%
rename from tests/phpunit/tests/post/primePostParentsCaches.php
rename to tests/phpunit/tests/post/primePostParentIdCaches.php
diff --git a/tests/phpunit/tests/post/thumbnails.php b/tests/phpunit/tests/post/thumbnails.php
index 8f596cbe7f679..05f09288c41a9 100644
--- a/tests/phpunit/tests/post/thumbnails.php
+++ b/tests/phpunit/tests/post/thumbnails.php
@@ -4,7 +4,7 @@
  * @group post
  * @group media
  */
-class Tests_Post_Thumbnail_Template extends WP_UnitTestCase {
+class Tests_Post_Thumbnails extends WP_UnitTestCase {
 	protected static $post;
 	protected static $different_post;
 	protected static $attachment_id;
diff --git a/tests/phpunit/tests/post/walkerPage.php b/tests/phpunit/tests/post/walkerPage.php
index d8a2312a54eff..291ac3a222818 100644
--- a/tests/phpunit/tests/post/walkerPage.php
+++ b/tests/phpunit/tests/post/walkerPage.php
@@ -3,7 +3,7 @@
  * @group post
  * @group walker
  */
-class Tests_Post_Walker_Page extends WP_UnitTestCase {
+class Tests_Post_WalkerPage extends WP_UnitTestCase {
 
 	/**
 	 * @var \Walker_Page The instance of the walker.
diff --git a/tests/phpunit/tests/post/wpGetAutoSave.php b/tests/phpunit/tests/post/wpGetAutoSave.php
index db27d25fad58d..eba58932324ec 100644
--- a/tests/phpunit/tests/post/wpGetAutoSave.php
+++ b/tests/phpunit/tests/post/wpGetAutoSave.php
@@ -3,7 +3,7 @@
 /**
  * @group post
  */
-class Tests_Post_wpGetPostAutosave extends WP_UnitTestCase {
+class Tests_Post_WpGetAutoSave extends WP_UnitTestCase {
 
 	/**
 	 * Admin user ID.
diff --git a/tests/phpunit/tests/post/wpPostType.php b/tests/phpunit/tests/post/wpPostType.php
index 23ec325a65a54..224b764f55a41 100644
--- a/tests/phpunit/tests/post/wpPostType.php
+++ b/tests/phpunit/tests/post/wpPostType.php
@@ -3,7 +3,7 @@
 /**
  * @group post
  */
-class Tests_Post_WP_Post_Type extends WP_UnitTestCase {
+class Tests_Post_WpPostType extends WP_UnitTestCase {
 	public function test_instances() {
 		global $wp_post_types;
 
diff --git a/tests/phpunit/tests/query/lazyLoadCommentMeta.php b/tests/phpunit/tests/query/lazyLoadCommentMeta.php
index 420fd45b23ce3..2c87fc807d9eb 100644
--- a/tests/phpunit/tests/query/lazyLoadCommentMeta.php
+++ b/tests/phpunit/tests/query/lazyLoadCommentMeta.php
@@ -4,7 +4,7 @@
  * @group comments
  * @group meta
  */
-class Tests_Lazy_Load_Comment_Meta extends WP_UnitTestCase {
+class Tests_Query_LazyLoadCommentMeta extends WP_UnitTestCase {
 
 	/**
 	 * @var int
diff --git a/tests/phpunit/tests/query/lazyLoadTermMeta.php b/tests/phpunit/tests/query/lazyLoadTermMeta.php
index fc34f84bb313c..f6ac583000c63 100644
--- a/tests/phpunit/tests/query/lazyLoadTermMeta.php
+++ b/tests/phpunit/tests/query/lazyLoadTermMeta.php
@@ -5,7 +5,7 @@
  * @group taxonomy
  * @group meta
  */
-class Test_Lazy_Load_Term_Meta extends WP_UnitTestCase {
+class Tests_Query_LazyLoadTermMeta extends WP_UnitTestCase {
 	/**
 	 * @var array
 	 */
diff --git a/tests/phpunit/tests/query/verboseRewriteRules.php b/tests/phpunit/tests/query/verboseRewriteRules.php
index 59ee2401317e2..630dd68f485bf 100644
--- a/tests/phpunit/tests/query/verboseRewriteRules.php
+++ b/tests/phpunit/tests/query/verboseRewriteRules.php
@@ -6,7 +6,7 @@
  * @group query
  * @group rewrite
  */
-class Tests_Query_VerbosePageRules extends Tests_Query_Conditionals {
+class Tests_Query_VerboseRewriteRules extends Tests_Query_Conditionals {
 	public function set_up() {
 		parent::set_up();
 
diff --git a/tests/phpunit/tests/rest-api.php b/tests/phpunit/tests/rest-api.php
index 90de3e13eecea..532880d679c05 100644
--- a/tests/phpunit/tests/rest-api.php
+++ b/tests/phpunit/tests/rest-api.php
@@ -13,7 +13,7 @@
 /**
  * @group restapi
  */
-class Tests_REST_API extends WP_UnitTestCase {
+class Tests_RestApi extends WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
diff --git a/tests/phpunit/tests/rest-api/application-passwords.php b/tests/phpunit/tests/rest-api/application-passwords.php
index 3dd76c0f94d61..6209d1d789d5b 100644
--- a/tests/phpunit/tests/rest-api/application-passwords.php
+++ b/tests/phpunit/tests/rest-api/application-passwords.php
@@ -8,7 +8,7 @@
  * @group  restapi
  * @group  app_password
  */
-class Test_WP_Application_Passwords extends WP_UnitTestCase {
+class Tests_RestApi_ApplicationPasswords extends WP_UnitTestCase {
 
 	/**
 	 * Administrator user id.
diff --git a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
index 060a5c0912a94..11285145604b7 100644
--- a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Application_Passwords_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestApplicationPasswordsController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * Subscriber user ID.
diff --git a/tests/phpunit/tests/rest-api/rest-attachments-controller.php b/tests/phpunit/tests/rest-api/rest-attachments-controller.php
index 05029e0845d96..81d2204efda0c 100644
--- a/tests/phpunit/tests/rest-api/rest-attachments-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-attachments-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
+class Tests_RestApi_RestAttachmentsController extends WP_Test_REST_Post_Type_Controller_Testcase {
 
 	protected static $superadmin_id;
 	protected static $editor_id;
diff --git a/tests/phpunit/tests/rest-api/rest-autosaves-controller.php b/tests/phpunit/tests/rest-api/rest-autosaves-controller.php
index 7815f8ced23c9..5d1da7b722173 100644
--- a/tests/phpunit/tests/rest-api/rest-autosaves-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-autosaves-controller.php
@@ -8,7 +8,7 @@
  * @group restapi-autosave
  * @group restapi
  */
-class WP_Test_REST_Autosaves_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
+class Tests_RestApi_RestAutosavesController extends WP_Test_REST_Post_Type_Controller_Testcase {
 	protected static $post_id;
 	protected static $page_id;
 	protected static $draft_page_id;
diff --git a/tests/phpunit/tests/rest-api/rest-block-directory-controller.php b/tests/phpunit/tests/rest-api/rest-block-directory-controller.php
index f61b317240532..09c6f3a046458 100644
--- a/tests/phpunit/tests/rest-api/rest-block-directory-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-directory-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_REST_Block_Directory_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestBlockDirectoryController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * Administrator user id.
diff --git a/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php b/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
index 3573ecb6e0bea..f0793af261545 100644
--- a/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
@@ -11,7 +11,7 @@
  * @group restapi-blocks
  * @group restapi
  */
-class REST_Block_Renderer_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestBlockRendererController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * The REST API route for the block renderer.
diff --git a/tests/phpunit/tests/rest-api/rest-block-type-controller.php b/tests/phpunit/tests/rest-api/rest-block-type-controller.php
index 7ba693286c993..c8259be7f7e28 100644
--- a/tests/phpunit/tests/rest-api/rest-block-type-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-type-controller.php
@@ -11,7 +11,7 @@
  * @group restapi-blocks
  * @group restapi
  */
-class REST_Block_Type_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestBlockTypeController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * Admin user ID.
diff --git a/tests/phpunit/tests/rest-api/rest-blocks-controller.php b/tests/phpunit/tests/rest-api/rest-blocks-controller.php
index 43a181683c788..516c5faf1fcec 100644
--- a/tests/phpunit/tests/rest-api/rest-blocks-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-blocks-controller.php
@@ -11,7 +11,7 @@
  * @group restapi-blocks
  * @group restapi
  */
-class REST_Blocks_Controller_Test extends WP_UnitTestCase {
+class Tests_RestApi_RestBlocksController extends WP_UnitTestCase {
 
 	/**
 	 * Our fake block's post ID.
diff --git a/tests/phpunit/tests/rest-api/rest-categories-controller.php b/tests/phpunit/tests/rest-api/rest-categories-controller.php
index 5d1f893d87fd4..da6741604c11f 100644
--- a/tests/phpunit/tests/rest-api/rest-categories-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-categories-controller.php
@@ -8,7 +8,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Categories_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestCategoriesController extends WP_Test_REST_Controller_Testcase {
 	protected static $administrator;
 	protected static $contributor;
 	protected static $subscriber;
diff --git a/tests/phpunit/tests/rest-api/rest-comments-controller.php b/tests/phpunit/tests/rest-api/rest-comments-controller.php
index 8542bcd42af24..5512ed0d90e0c 100644
--- a/tests/phpunit/tests/rest-api/rest-comments-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-comments-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Comments_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestCommentsController extends WP_Test_REST_Controller_Testcase {
 	protected static $superadmin_id;
 	protected static $admin_id;
 	protected static $editor_id;
diff --git a/tests/phpunit/tests/rest-api/rest-controller.php b/tests/phpunit/tests/rest-api/rest-controller.php
index 33ac4f3c814f7..35319c5053fa9 100644
--- a/tests/phpunit/tests/rest-api/rest-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Controller extends WP_Test_REST_TestCase {
+class Tests_RestApi_RestController extends WP_Test_REST_TestCase {
 
 	/**
 	 * @var WP_REST_Request
diff --git a/tests/phpunit/tests/rest-api/rest-global-styles-controller.php b/tests/phpunit/tests/rest-api/rest-global-styles-controller.php
index 59986e597c71b..8b636cc71422a 100644
--- a/tests/phpunit/tests/rest-api/rest-global-styles-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-global-styles-controller.php
@@ -10,7 +10,7 @@
  * @group restapi-global-styles
  * @group restapi
  */
-class WP_REST_Global_Styles_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestGlobalStylesController extends WP_Test_REST_Controller_Testcase {
 	/**
 	 * @var int
 	 */
diff --git a/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php b/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
index a715899979ad1..a219bc7760a67 100644
--- a/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
@@ -10,7 +10,7 @@
  * @group restapi-global-styles
  * @group restapi
  */
-class WP_REST_Global_Styles_Revisions_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestGlobalStylesRevisionsController extends WP_Test_REST_Controller_Testcase {
 	/**
 	 * @var int
 	 */
diff --git a/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php b/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php
index 3be0bba59f26f..44c628ed42d1f 100644
--- a/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php
@@ -18,7 +18,7 @@
  * @group restapi
  * @group navigation
  */
-class WP_REST_Navigation_Fallback_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestNavigationFallbackController extends WP_Test_REST_Controller_Testcase {
 
 	protected static $admin_user;
 	protected static $editor_user;
diff --git a/tests/phpunit/tests/rest-api/rest-pages-controller.php b/tests/phpunit/tests/rest-api/rest-pages-controller.php
index 9717a7fcda1c6..9f24406ad133d 100644
--- a/tests/phpunit/tests/rest-api/rest-pages-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-pages-controller.php
@@ -8,7 +8,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Pages_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
+class Tests_RestApi_RestPagesController extends WP_Test_REST_Post_Type_Controller_Testcase {
 	protected static $editor_id;
 
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
diff --git a/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php b/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
index 038994cdd1183..cf3fc09b57545 100644
--- a/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
@@ -8,7 +8,7 @@
  * @group restapi
  * @group pattern-directory
  */
-class WP_REST_Pattern_Directory_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestPatternDirectoryController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * Contributor user id.
diff --git a/tests/phpunit/tests/rest-api/rest-plugins-controller.php b/tests/phpunit/tests/rest-api/rest-plugins-controller.php
index d6290b071bf22..459b97ab4fca3 100644
--- a/tests/phpunit/tests/rest-api/rest-plugins-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-plugins-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_REST_Plugins_Controller_Test extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestPluginsController extends WP_Test_REST_Controller_Testcase {
 
 	const BASE        = '/wp/v2/plugins';
 	const PLUGIN      = 'test-plugin/test-plugin';
diff --git a/tests/phpunit/tests/rest-api/rest-post-meta-fields.php b/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
index 47eada094d0ee..8065fd6544e23 100644
--- a/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
+++ b/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Post_Meta_Fields extends WP_Test_REST_TestCase {
+class Tests_RestApi_RestPostMetaFields extends WP_Test_REST_TestCase {
 	protected static $wp_meta_keys_saved;
 	protected static $post_id;
 	protected static $cpt_post_id;
diff --git a/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php b/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php
index f6bb1d795a114..16fa4e800b3ce 100644
--- a/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Post_Statuses_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestPostStatusesController extends WP_Test_REST_Controller_Testcase {
 
 	public function test_register_routes() {
 		$routes = rest_get_server()->get_routes();
diff --git a/tests/phpunit/tests/rest-api/rest-post-types-controller.php b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
index f230373ce27a4..3a9c3dc14ef3b 100644
--- a/tests/phpunit/tests/rest-api/rest-post-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Post_Types_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestPostTypesController extends WP_Test_REST_Controller_Testcase {
 
 	public function test_register_routes() {
 		$routes = rest_get_server()->get_routes();
diff --git a/tests/phpunit/tests/rest-api/rest-posts-controller.php b/tests/phpunit/tests/rest-api/rest-posts-controller.php
index d701d12f9dd68..20a02600bbe38 100644
--- a/tests/phpunit/tests/rest-api/rest-posts-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-posts-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
+class Tests_RestApi_RestPostsController extends WP_Test_REST_Post_Type_Controller_Testcase {
 	protected static $post_id;
 
 	protected static $superadmin_id;
diff --git a/tests/phpunit/tests/rest-api/rest-request-validation.php b/tests/phpunit/tests/rest-api/rest-request-validation.php
index 3d81536099494..4f88b68e8a48b 100644
--- a/tests/phpunit/tests/rest-api/rest-request-validation.php
+++ b/tests/phpunit/tests/rest-api/rest-request-validation.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Request_Validation extends WP_Test_REST_TestCase {
+class Tests_RestApi_RestRequestValidation extends WP_Test_REST_TestCase {
 
 	public function test_validate_within_min_max_range_inclusive() {
 		$request = new WP_REST_Request(
diff --git a/tests/phpunit/tests/rest-api/rest-request.php b/tests/phpunit/tests/rest-api/rest-request.php
index d689f9d18d4d0..dd6a456ea6f29 100644
--- a/tests/phpunit/tests/rest-api/rest-request.php
+++ b/tests/phpunit/tests/rest-api/rest-request.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class Tests_REST_Request extends WP_UnitTestCase {
+class Tests_RestApi_RestRequest extends WP_UnitTestCase {
 	public $request;
 
 	public function set_up() {
diff --git a/tests/phpunit/tests/rest-api/rest-revisions-controller.php b/tests/phpunit/tests/rest-api/rest-revisions-controller.php
index 52011afcb9318..3afd3bd0a0edc 100644
--- a/tests/phpunit/tests/rest-api/rest-revisions-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-revisions-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Revisions_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestRevisionsController extends WP_Test_REST_Controller_Testcase {
 	protected static $post_id;
 	protected static $post_id_2;
 	protected static $page_id;
diff --git a/tests/phpunit/tests/rest-api/rest-schema-sanitization.php b/tests/phpunit/tests/rest-api/rest-schema-sanitization.php
index 2cea494c064ea..e80d7c35f408f 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-sanitization.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-sanitization.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Schema_Sanitization extends WP_UnitTestCase {
+class Tests_RestApi_RestSchemaSanitization extends WP_UnitTestCase {
 
 	public function test_type_number() {
 		$schema = array(
diff --git a/tests/phpunit/tests/rest-api/rest-schema-setup.php b/tests/phpunit/tests/rest-api/rest-schema-setup.php
index b5e9a177a7765..a127a724b439d 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-setup.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-setup.php
@@ -10,7 +10,7 @@
  * @group restapi
  * @group restapi-jsclient
  */
-class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
+class Tests_RestApi_RestSchemaSetup extends WP_Test_REST_TestCase {
 	const YOUTUBE_VIDEO_ID = 'i_cVJgIz_Cs';
 
 	public function set_up() {
diff --git a/tests/phpunit/tests/rest-api/rest-schema-validation.php b/tests/phpunit/tests/rest-api/rest-schema-validation.php
index ce8875c3e9339..3c73986821c58 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-validation.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-validation.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Schema_Validation extends WP_UnitTestCase {
+class Tests_RestApi_RestSchemaValidation extends WP_UnitTestCase {
 
 	public function test_type_number() {
 		$schema = array(
diff --git a/tests/phpunit/tests/rest-api/rest-search-controller.php b/tests/phpunit/tests/rest-api/rest-search-controller.php
index e4235fd699798..5f19d487695cc 100644
--- a/tests/phpunit/tests/rest-api/rest-search-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-search-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Search_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestSearchController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * Posts with title 'my-footitle'.
diff --git a/tests/phpunit/tests/rest-api/rest-server.php b/tests/phpunit/tests/rest-api/rest-server.php
index 692c363ac7595..9d992ff5540ae 100644
--- a/tests/phpunit/tests/rest-api/rest-server.php
+++ b/tests/phpunit/tests/rest-api/rest-server.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class Tests_REST_Server extends WP_Test_REST_TestCase {
+class Tests_RestApi_RestServer extends WP_Test_REST_TestCase {
 	protected static $icon_id;
 	protected static $admin_id;
 	protected static $post_id;
diff --git a/tests/phpunit/tests/rest-api/rest-settings-controller.php b/tests/phpunit/tests/rest-api/rest-settings-controller.php
index e8f90b53f20f1..1f007b11edb45 100644
--- a/tests/phpunit/tests/rest-api/rest-settings-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-settings-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Settings_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestSettingsController extends WP_Test_REST_Controller_Testcase {
 
 	protected static $administrator;
 	protected static $author;
diff --git a/tests/phpunit/tests/rest-api/rest-sidebars-controller.php b/tests/phpunit/tests/rest-api/rest-sidebars-controller.php
index dd01d4f2de4ee..15d761dd4606c 100644
--- a/tests/phpunit/tests/rest-api/rest-sidebars-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-sidebars-controller.php
@@ -12,7 +12,7 @@
  * @group restapi
  * @group widgets
  */
-class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestSidebarsController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * @var int
diff --git a/tests/phpunit/tests/rest-api/rest-site-health-controller.php b/tests/phpunit/tests/rest-api/rest-site-health-controller.php
index 9d67401d57d60..3a1c8584af553 100644
--- a/tests/phpunit/tests/rest-api/rest-site-health-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-site-health-controller.php
@@ -10,7 +10,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Site_Health_Controller extends WP_Test_REST_TestCase {
+class Tests_RestApi_RestSiteHealthController extends WP_Test_REST_TestCase {
 
 	/**
 	 * Subscriber user ID.
diff --git a/tests/phpunit/tests/rest-api/rest-tags-controller.php b/tests/phpunit/tests/rest-api/rest-tags-controller.php
index 3b23135c93706..73072c8d0f45f 100644
--- a/tests/phpunit/tests/rest-api/rest-tags-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-tags-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestTagsController extends WP_Test_REST_Controller_Testcase {
 	protected static $superadmin;
 	protected static $administrator;
 	protected static $editor;
diff --git a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
index 4d8a57d5602b8..8c92afbe6d456 100644
--- a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Taxonomies_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestTaxonomiesController extends WP_Test_REST_Controller_Testcase {
 
 	protected static $contributor_id;
 
diff --git a/tests/phpunit/tests/rest-api/rest-term-meta-fields.php b/tests/phpunit/tests/rest-api/rest-term-meta-fields.php
index 8d4ba295f87a5..359326483c068 100644
--- a/tests/phpunit/tests/rest-api/rest-term-meta-fields.php
+++ b/tests/phpunit/tests/rest-api/rest-term-meta-fields.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Term_Meta_Fields extends WP_Test_REST_TestCase {
+class Tests_RestApi_RestTermMetaFields extends WP_Test_REST_TestCase {
 	protected static $wp_meta_keys_saved;
 	protected static $category_id;
 	protected static $customtax_term_id;
diff --git a/tests/phpunit/tests/rest-api/rest-test-controller.php b/tests/phpunit/tests/rest-api/rest-test-controller.php
index 48b326407d9f2..d2a3de85a7b0e 100644
--- a/tests/phpunit/tests/rest-api/rest-test-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-test-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_REST_Test_Controller extends WP_REST_Controller {
+class Tests_RestApi_RestTestController extends WP_REST_Controller {
 	/**
 	 * Prepares the item for the REST response.
 	 *
diff --git a/tests/phpunit/tests/rest-api/rest-themes-controller.php b/tests/phpunit/tests/rest-api/rest-themes-controller.php
index 923e7cda27374..3b165d030755c 100644
--- a/tests/phpunit/tests/rest-api/rest-themes-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-themes-controller.php
@@ -8,7 +8,7 @@
  * @group restapi-themes
  * @group restapi
  */
-class WP_Test_REST_Themes_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestThemesController extends WP_Test_REST_Controller_Testcase {
 	/**
 	 * Subscriber user ID.
 	 *
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index b78e95b95f48d..13994725579f2 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -7,7 +7,7 @@
  *
  * @group restapi
  */
-class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestUsersController extends WP_Test_REST_Controller_Testcase {
 	protected static $superadmin;
 	protected static $user;
 	protected static $editor;
diff --git a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
index 3003c2e9741de..b27d1e472caa6 100644
--- a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
@@ -12,7 +12,7 @@
  * @group restapi
  * @group widgets
  */
-class WP_Test_REST_Widget_Types_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestWidgetTypesController extends WP_Test_REST_Controller_Testcase {
 
 	/**
 	 * Admin user ID.
diff --git a/tests/phpunit/tests/rest-api/rest-widgets-controller.php b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
index 246ad3b61eb09..426859b2fd1ae 100644
--- a/tests/phpunit/tests/rest-api/rest-widgets-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
@@ -12,7 +12,7 @@
  * @group restapi
  * @group widgets
  */
-class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
+class Tests_RestApi_RestWidgetsController extends WP_Test_REST_Controller_Testcase {
 	/**
 	 * @var int
 	 */
diff --git a/tests/phpunit/tests/rest-api/wpIsRestEndpoint.php b/tests/phpunit/tests/rest-api/wpIsRestEndpoint.php
index 2cc9c0cad4d64..149e102aa6150 100644
--- a/tests/phpunit/tests/rest-api/wpIsRestEndpoint.php
+++ b/tests/phpunit/tests/rest-api/wpIsRestEndpoint.php
@@ -6,7 +6,7 @@
  * @group restapi
  * @covers ::wp_is_rest_endpoint
  */
-class Tests_Media_Wp_Is_Rest_Endpoint extends WP_UnitTestCase {
+class Tests_RestApi_WpIsRestEndpoint extends WP_UnitTestCase {
 
 	/**
 	 * Tests that `wp_is_rest_endpoint()` returns false by default.
diff --git a/tests/phpunit/tests/rewrite/rewriteTags.php b/tests/phpunit/tests/rewrite/rewriteTags.php
index 31c28df15e283..823e5c6ee023f 100644
--- a/tests/phpunit/tests/rewrite/rewriteTags.php
+++ b/tests/phpunit/tests/rewrite/rewriteTags.php
@@ -3,7 +3,7 @@
 /**
  * @group rewrite
  */
-class Tests_Rewrite_Tags extends WP_UnitTestCase {
+class Tests_Rewrite_RewriteTags extends WP_UnitTestCase {
 	protected $rewritecode;
 	protected $rewritereplace;
 	protected $queryreplace;
diff --git a/tests/phpunit/tests/style-engine/styleEngine.php b/tests/phpunit/tests/style-engine/styleEngine.php
index 4e85ecad52299..67c0a29403c3e 100644
--- a/tests/phpunit/tests/style-engine/styleEngine.php
+++ b/tests/phpunit/tests/style-engine/styleEngine.php
@@ -12,7 +12,7 @@
 /**
  * Tests for registering, storing and generating styles.
  */
-class Tests_wpStyleEngine extends WP_UnitTestCase {
+class Tests_StyleEngine_StyleEngine extends WP_UnitTestCase {
 	/**
 	 * Tests generating block styles and classnames based on various manifestations of the $block_styles argument.
 	 *
diff --git a/tests/phpunit/tests/term/getTermParentsList.php b/tests/phpunit/tests/term/getTermParentsList.php
index 753fc8fc90d31..6b07cbbdc84e2 100644
--- a/tests/phpunit/tests/term/getTermParentsList.php
+++ b/tests/phpunit/tests/term/getTermParentsList.php
@@ -3,7 +3,7 @@
 /**
  * @group taxonomy
  */
-class Tests_Terms_GetTermsParentsList extends WP_UnitTestCase {
+class Tests_Term_GetTermParentsList extends WP_UnitTestCase {
 	protected static $c1;
 	protected static $c2;
 
diff --git a/tests/phpunit/tests/term/taxQuery.php b/tests/phpunit/tests/term/taxQuery.php
index 40f1d29612e70..de595e4f33ae8 100644
--- a/tests/phpunit/tests/term/taxQuery.php
+++ b/tests/phpunit/tests/term/taxQuery.php
@@ -3,7 +3,7 @@
 /**
  * @group taxonomy
  */
-class Tests_Term_Tax_Query extends WP_UnitTestCase {
+class Tests_Term_TaxQuery extends WP_UnitTestCase {
 	protected $q;
 
 	public function set_up() {
diff --git a/tests/phpunit/tests/term/termCounts.php b/tests/phpunit/tests/term/termCounts.php
index a0df17eb3460a..069812c235491 100644
--- a/tests/phpunit/tests/term/termCounts.php
+++ b/tests/phpunit/tests/term/termCounts.php
@@ -3,7 +3,7 @@
 /**
  * @group taxonomy
  */
-class Tests_Term_termCount extends WP_UnitTestCase {
+class Tests_Term_TermCounts extends WP_UnitTestCase {
 
 	/**
 	 * Term ID for testing attachment counts.
diff --git a/tests/phpunit/tests/term/wpGenerateTagCloud.php b/tests/phpunit/tests/term/wpGenerateTagCloud.php
index 4b7a27fb475e9..7df360076df45 100644
--- a/tests/phpunit/tests/term/wpGenerateTagCloud.php
+++ b/tests/phpunit/tests/term/wpGenerateTagCloud.php
@@ -2,7 +2,7 @@
 /**
  * @group taxonomy
  */
-class Tests_WP_Generate_Tag_Cloud extends WP_UnitTestCase {
+class Tests_Term_WpGenerateTagCloud extends WP_UnitTestCase {
 	protected $terms = array();
 
 	/**
diff --git a/tests/phpunit/tests/term/wpTaxonomy.php b/tests/phpunit/tests/term/wpTaxonomy.php
index 845497ad0672a..3e362d83424ad 100644
--- a/tests/phpunit/tests/term/wpTaxonomy.php
+++ b/tests/phpunit/tests/term/wpTaxonomy.php
@@ -3,7 +3,7 @@
 /**
  * @group taxonomy
  */
-class Tests_WP_Taxonomy extends WP_UnitTestCase {
+class Tests_Term_WpTaxonomy extends WP_UnitTestCase {
 	public function test_instances() {
 		global $wp_taxonomies;
 
diff --git a/tests/phpunit/tests/theme-previews.php b/tests/phpunit/tests/theme-previews.php
index 22c9a8bbd2eb6..ba96a0fc6363d 100644
--- a/tests/phpunit/tests/theme-previews.php
+++ b/tests/phpunit/tests/theme-previews.php
@@ -5,7 +5,7 @@
  *
  * @group themes
  */
-class Tests_Theme_Previews extends WP_UnitTestCase {
+class Tests_ThemePreviews extends WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 	}
diff --git a/tests/phpunit/tests/theme/autoloadThemeMods.php b/tests/phpunit/tests/theme/autoloadThemeMods.php
index 9dbd668f2a3f3..d1ebf1912bd74 100644
--- a/tests/phpunit/tests/theme/autoloadThemeMods.php
+++ b/tests/phpunit/tests/theme/autoloadThemeMods.php
@@ -10,7 +10,7 @@
  *
  * @group themes
  */
-class Tests_Autoload_Theme_Mods extends WP_Theme_UnitTestCase {
+class Tests_Theme_AutoloadThemeMods extends WP_Theme_UnitTestCase {
 
 	/**
 	 * Tests that theme mods should not autoloaded after switch_theme.
diff --git a/tests/phpunit/tests/theme/wpGetBlockCssSelector.php b/tests/phpunit/tests/theme/wpGetBlockCssSelector.php
index d52dff978998c..2fc36f0fdd402 100644
--- a/tests/phpunit/tests/theme/wpGetBlockCssSelector.php
+++ b/tests/phpunit/tests/theme/wpGetBlockCssSelector.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once __DIR__ . '/base.php';
+
 /**
  * Tests wp_get_block_css_selector().
  *
diff --git a/tests/phpunit/tests/unicode/wpIsValidUtf8.php b/tests/phpunit/tests/unicode/wpIsValidUtf8.php
index 43876a7eee8e6..e5ee66d3567f6 100644
--- a/tests/phpunit/tests/unicode/wpIsValidUtf8.php
+++ b/tests/phpunit/tests/unicode/wpIsValidUtf8.php
@@ -6,7 +6,7 @@
  * @group unicode
  */
 
-class Tests_WpIsValidUtf8TestCase extends WP_UnitTestCase {
+class Tests_Unicode_WpIsValidUTF8 extends WP_UnitTestCase {
 	/**
 	 * Verifies that WordPress can properly detect valid and invalid UTF-8.
 	 *
diff --git a/tests/phpunit/tests/user/queryCache.php b/tests/phpunit/tests/user/queryCache.php
index fb556bfa36b21..5ece5e58dc488 100644
--- a/tests/phpunit/tests/user/queryCache.php
+++ b/tests/phpunit/tests/user/queryCache.php
@@ -6,7 +6,7 @@
  *
  * @coversDefaultClass WP_User_Query
  */
-class Tests_User_Query_Cache extends WP_UnitTestCase {
+class Tests_User_QueryCache extends WP_UnitTestCase {
 	/**
 	 * @var int[]
 	 */
diff --git a/tests/phpunit/tests/widgets/wpBlockThemeRegisterClassicSidebar.php b/tests/phpunit/tests/widgets/wpBlockThemeRegisterClassicSidebar.php
index f8f8c519ae639..4975443acfce4 100644
--- a/tests/phpunit/tests/widgets/wpBlockThemeRegisterClassicSidebar.php
+++ b/tests/phpunit/tests/widgets/wpBlockThemeRegisterClassicSidebar.php
@@ -5,7 +5,7 @@
  * @group widgets
  * @covers ::_wp_block_theme_register_classic_sidebars
  */
-class Tests_Widgets_WpBlockThemeRegisterClassicSidebars extends WP_UnitTestCase {
+class Tests_Widgets_WpBlockThemeRegisterClassicSidebar extends WP_UnitTestCase {
 	/**
 	 * Original global $wp_registered_sidebars.
 	 *