diff --git a/tests/phpunit/tests/blocks/block-context.php b/tests/phpunit/tests/blocks/context.php
similarity index 97%
rename from tests/phpunit/tests/blocks/block-context.php
rename to tests/phpunit/tests/blocks/context.php
index 7089ebb84b..5131d20b3b 100644
--- a/tests/phpunit/tests/blocks/block-context.php
+++ b/tests/phpunit/tests/blocks/context.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WP_Block_Context Tests
+ * Block context tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for WP_Block_Context
+ * Tests for block context functions.
  *
  * @since 5.5.0
  *
  * @group blocks
  */
-class WP_Block_Context_Test extends WP_UnitTestCase {
+class Tests_Blocks_Context extends WP_UnitTestCase {
 
 	/**
 	 * Registered block names.
diff --git a/tests/phpunit/tests/blocks/block-editor.php b/tests/phpunit/tests/blocks/editor.php
similarity index 99%
rename from tests/phpunit/tests/blocks/block-editor.php
rename to tests/phpunit/tests/blocks/editor.php
index c9f1ac843b..fac3cec940 100644
--- a/tests/phpunit/tests/blocks/block-editor.php
+++ b/tests/phpunit/tests/blocks/editor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WP_Block Tests
+ * Block editor tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -14,7 +14,7 @@
  *
  * @group blocks
  */
-class WP_Test_Block_Editor extends WP_UnitTestCase {
+class Tests_Blocks_Editor extends WP_UnitTestCase {
 
 	/**
 	 * Sets up each test method.
diff --git a/tests/phpunit/tests/blocks/register.php b/tests/phpunit/tests/blocks/register.php
index 7388fd6ab6..da2e7d09b6 100644
--- a/tests/phpunit/tests/blocks/register.php
+++ b/tests/phpunit/tests/blocks/register.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Block registry tests.
+ * Block registration tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for register_block_type(), unregister_block_type(), get_dynamic_block_names()
+ * Tests for register_block_type(), unregister_block_type(), get_dynamic_block_names().
  *
  * @since 5.0.0
  *
  * @group blocks
  */
-class WP_Test_Block_Register extends WP_UnitTestCase {
+class Tests_Blocks_Register extends WP_UnitTestCase {
 
 	/**
 	 * ID for a test post.
diff --git a/tests/phpunit/tests/blocks/render.php b/tests/phpunit/tests/blocks/render.php
index db449c3a20..c8897be977 100644
--- a/tests/phpunit/tests/blocks/render.php
+++ b/tests/phpunit/tests/blocks/render.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Block rendering tests.
+ * Block rendering tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for block rendering functions
+ * Tests for block rendering functions.
  *
  * @since 5.0.0
  *
  * @group blocks
  */
-class WP_Test_Block_Render extends WP_UnitTestCase {
+class Tests_Blocks_Render extends WP_UnitTestCase {
 	/**
 	 * The location of the fixtures to test with.
 	 *
diff --git a/tests/phpunit/tests/blocks/render-reusable.php b/tests/phpunit/tests/blocks/renderReusable.php
similarity index 96%
rename from tests/phpunit/tests/blocks/render-reusable.php
rename to tests/phpunit/tests/blocks/renderReusable.php
index 019a7ea0c3..086ae67894 100644
--- a/tests/phpunit/tests/blocks/render-reusable.php
+++ b/tests/phpunit/tests/blocks/renderReusable.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Reusable block rendering tests.
+ * Reusable block rendering tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -14,7 +14,7 @@
  *
  * @group blocks
  */
-class WP_Test_Render_Reusable_Blocks extends WP_UnitTestCase {
+class Tests_Blocks_RenderReusable extends WP_UnitTestCase {
 	/**
 	 * Fake user ID.
 	 *
diff --git a/tests/phpunit/tests/blocks/serialization.php b/tests/phpunit/tests/blocks/serialize.php
similarity index 91%
rename from tests/phpunit/tests/blocks/serialization.php
rename to tests/phpunit/tests/blocks/serialize.php
index 1e4f2fcacb..199a72007e 100644
--- a/tests/phpunit/tests/blocks/serialization.php
+++ b/tests/phpunit/tests/blocks/serialize.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Block serialization tests.
+ * Block serialization tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for block serialization functions
+ * Tests for block serialization functions.
  *
  * @since 5.3.3
  *
  * @group blocks
  */
-class WP_Test_Block_Serialization extends WP_UnitTestCase {
+class Tests_Blocks_Serialize extends WP_UnitTestCase {
 
 	/**
 	 * @dataProvider data_serialize_identity_from_parsed
diff --git a/tests/phpunit/tests/blocks/block-supported-styles.php b/tests/phpunit/tests/blocks/supportedStyles.php
similarity index 99%
rename from tests/phpunit/tests/blocks/block-supported-styles.php
rename to tests/phpunit/tests/blocks/supportedStyles.php
index 0ea2a00c74..73b2b1bdc6 100644
--- a/tests/phpunit/tests/blocks/block-supported-styles.php
+++ b/tests/phpunit/tests/blocks/supportedStyles.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Block Tests
+ * Block supported style tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -14,7 +14,7 @@
  *
  * @group blocks
  */
-class Block_Supported_Styles_Test extends WP_UnitTestCase {
+class Tests_Blocks_SupportedStyles extends WP_UnitTestCase {
 
 	/**
 	 * Block content to test with (i.e. what's wrapped by the block wrapper `<div />`).
diff --git a/tests/phpunit/tests/blocks/block.php b/tests/phpunit/tests/blocks/wpBlock.php
similarity index 99%
rename from tests/phpunit/tests/blocks/block.php
rename to tests/phpunit/tests/blocks/wpBlock.php
index e74516fcd5..84b748540a 100644
--- a/tests/phpunit/tests/blocks/block.php
+++ b/tests/phpunit/tests/blocks/wpBlock.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WP_Block Tests
+ * WP_Block tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for WP_Block
+ * Tests for WP_Block.
  *
  * @since 5.5.0
  *
  * @group blocks
  */
-class WP_Block_Test extends WP_UnitTestCase {
+class Tests_Blocks_wpBlock extends WP_UnitTestCase {
 
 	/**
 	 * Fake block type registry.
diff --git a/tests/phpunit/tests/blocks/block-list.php b/tests/phpunit/tests/blocks/wpBlockList.php
similarity index 95%
rename from tests/phpunit/tests/blocks/block-list.php
rename to tests/phpunit/tests/blocks/wpBlockList.php
index fa2b715d1b..3e1664dacf 100644
--- a/tests/phpunit/tests/blocks/block-list.php
+++ b/tests/phpunit/tests/blocks/wpBlockList.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WP_Block_List tests.
+ * WP_Block_List tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for WP_Block_List
+ * Tests for WP_Block_List.
  *
  * @since 5.5.0
  *
  * @group blocks
  */
-class WP_Block_List_Test extends WP_UnitTestCase {
+class Tests_Blocks_wpBlockList extends WP_UnitTestCase {
 
 	/**
 	 * Fake block type registry.
diff --git a/tests/phpunit/tests/blocks/block-parser.php b/tests/phpunit/tests/blocks/wpBlockParser.php
similarity index 96%
rename from tests/phpunit/tests/blocks/block-parser.php
rename to tests/phpunit/tests/blocks/wpBlockParser.php
index 8bdd0ddb57..8169d4f610 100644
--- a/tests/phpunit/tests/blocks/block-parser.php
+++ b/tests/phpunit/tests/blocks/wpBlockParser.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WP_Block_Parser tests.
+ * WP_Block_Parser tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for WP_Block_Parser
+ * Tests for WP_Block_Parser.
  *
  * @since 5.0.0
  *
  * @group blocks
  */
-class WP_Test_Block_Parser extends WP_UnitTestCase {
+class Tests_Blocks_wpBlockParser extends WP_UnitTestCase {
 	/**
 	 * The location of the fixtures to test with.
 	 *
diff --git a/tests/phpunit/tests/blocks/block-type.php b/tests/phpunit/tests/blocks/wpBlockType.php
similarity index 99%
rename from tests/phpunit/tests/blocks/block-type.php
rename to tests/phpunit/tests/blocks/wpBlockType.php
index 8f36a9bcf5..e0c64df8db 100644
--- a/tests/phpunit/tests/blocks/block-type.php
+++ b/tests/phpunit/tests/blocks/wpBlockType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WP_Block_Type Tests
+ * WP_Block_Type tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for WP_Block_Type
+ * Tests for WP_Block_Type.
  *
  * @since 5.0.0
  *
  * @group blocks
  */
-class WP_Test_Block_Type extends WP_UnitTestCase {
+class Tests_Blocks_wpBlockType extends WP_UnitTestCase {
 
 	/**
 	 * Editor user ID.
diff --git a/tests/phpunit/tests/blocks/block-type-registry.php b/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
similarity index 96%
rename from tests/phpunit/tests/blocks/block-type-registry.php
rename to tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
index d46b46685a..6f2068f966 100644
--- a/tests/phpunit/tests/blocks/block-type-registry.php
+++ b/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * WP_Block_Type_Registry Tests
+ * WP_Block_Type_Registry tests
  *
  * @package WordPress
  * @subpackage Blocks
@@ -8,13 +8,13 @@
  */
 
 /**
- * Tests for WP_Block_Type_Registry
+ * Tests for WP_Block_Type_Registry.
  *
  * @since 5.0.0
  *
  * @group blocks
  */
-class WP_Test_Block_Type_Registry extends WP_UnitTestCase {
+class Tests_Blocks_wpBlockTypeRegistry extends WP_UnitTestCase {
 
 	/**
 	 * Fake block type registry.