diff --git a/tests/phpunit/tests/admin/wpCommunityEvents.php b/tests/phpunit/tests/admin/wpCommunityEvents.php
index 6dfd4f044a..6b8ccc7f9b 100644
--- a/tests/phpunit/tests/admin/wpCommunityEvents.php
+++ b/tests/phpunit/tests/admin/wpCommunityEvents.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.8.0
- */
-
-/**
- * Class Tests_Admin_wpCommunityEvents.
  *
  * @group admin
  * @group community-events
- *
- * @since 4.8.0
  */
 class Tests_Admin_wpCommunityEvents extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php b/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php
index 7f555c4d25..96fd23794b 100644
--- a/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php
+++ b/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php
@@ -1,15 +1,7 @@
 <?php
 /**
- * Test the `WP_Privacy_Requests_Table` class.
- *
  * @package WordPress\UnitTests
- *
- * @since 5.1.0
- */
-
-/**
- * Tests_Admin_wpPrivacyRequestsTable class.
- *
+ * 
  * @group admin
  * @group privacy
  *
diff --git a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php
index 068165b991..4f76ea12fb 100644
--- a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php
+++ b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress\UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Ajax_PrivacyExportPersonalData class.
- *
- * @since 5.2.0
  *
  * @group ajax
  * @group privacy
diff --git a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php
index f8e588ff5e..51e4cb1391 100644
--- a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php
+++ b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress\UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Ajax_PrivacyExportPersonalData class.
- *
- * @since 5.2.0
  *
  * @group ajax
  * @group privacy
diff --git a/tests/phpunit/tests/block-supports/layout.php b/tests/phpunit/tests/block-supports/layout.php
index 7424aa3317..6961d1ee04 100644
--- a/tests/phpunit/tests/block-supports/layout.php
+++ b/tests/phpunit/tests/block-supports/layout.php
@@ -5,12 +5,6 @@
  * @package WordPress
  * @subpackage Block Supports
  * @since 6.0.0
- */
-
-/**
- * Tests for block supports related to layout.
- *
- * @since 6.0.0
  *
  * @group block-supports
  *
diff --git a/tests/phpunit/tests/block-template-utils.php b/tests/phpunit/tests/block-template-utils.php
index 6e4a5b9e5c..a4ff331966 100644
--- a/tests/phpunit/tests/block-template-utils.php
+++ b/tests/phpunit/tests/block-template-utils.php
@@ -1,11 +1,8 @@
 <?php
 /**
- * Tests_Block_Template_Utils class
  *
  * @package WordPress
- */
-
-/**
+ *
  * Tests for the Block Templates abstraction layer.
  *
  * @group block-templates
diff --git a/tests/phpunit/tests/block-template.php b/tests/phpunit/tests/block-template.php
index 5439ac3793..409b369310 100644
--- a/tests/phpunit/tests/block-template.php
+++ b/tests/phpunit/tests/block-template.php
@@ -1,12 +1,9 @@
 <?php
 /**
- * Tests_Block_Template class
  *
  * @package WordPress
- */
-
-/**
- * Tests for the block template loading algorithm.
+ *
+ * Tests cases for the block template loading algorithm.
  *
  * @group block-templates
  */
diff --git a/tests/phpunit/tests/blocks/context.php b/tests/phpunit/tests/blocks/context.php
index 04f9a88176..605d980ee5 100644
--- a/tests/phpunit/tests/blocks/context.php
+++ b/tests/phpunit/tests/blocks/context.php
@@ -4,12 +4,7 @@
  *
  * @package WordPress
  * @subpackage Blocks
- * @since 5.5.0
- */
-
-/**
- * Tests for block context functions.
- *
+ * 
  * @since 5.5.0
  *
  * @group blocks
diff --git a/tests/phpunit/tests/blocks/editor.php b/tests/phpunit/tests/blocks/editor.php
index 831160448b..8d776a55b5 100644
--- a/tests/phpunit/tests/blocks/editor.php
+++ b/tests/phpunit/tests/blocks/editor.php
@@ -5,12 +5,6 @@
  * @package WordPress
  * @subpackage Blocks
  * @since 5.5.0
- */
-
-/**
- * Tests for the block editor methods.
- *
- * @since 5.5.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/register.php b/tests/phpunit/tests/blocks/register.php
index ca906086a3..f94a7ab283 100644
--- a/tests/phpunit/tests/blocks/register.php
+++ b/tests/phpunit/tests/blocks/register.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * Block registration tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
+ * 
  * Tests for register_block_type(), unregister_block_type(), get_dynamic_block_names(), and register_block_style().
  *
- * @since 5.0.0
- *
  * @group blocks
  */
 class Tests_Blocks_Register extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/render.php b/tests/phpunit/tests/blocks/render.php
index e119517d4e..37c4293383 100644
--- a/tests/phpunit/tests/blocks/render.php
+++ b/tests/phpunit/tests/blocks/render.php
@@ -5,12 +5,6 @@
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
- * Tests for block rendering functions.
- *
- * @since 5.0.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/renderCommentTemplate.php b/tests/phpunit/tests/blocks/renderCommentTemplate.php
index 38c1d03667..44d58ca0b1 100644
--- a/tests/phpunit/tests/blocks/renderCommentTemplate.php
+++ b/tests/phpunit/tests/blocks/renderCommentTemplate.php
@@ -5,12 +5,6 @@
  * @package WordPress
  * @subpackage Blocks
  * @since 6.0.0
- */
-
-/**
- * Tests for the Comment Template block.
- *
- * @since 6.0.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/renderReusable.php b/tests/phpunit/tests/blocks/renderReusable.php
index 086ae67894..cafef6023c 100644
--- a/tests/phpunit/tests/blocks/renderReusable.php
+++ b/tests/phpunit/tests/blocks/renderReusable.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * Reusable block rendering tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
+ * 
  * Tests for reusable block rendering.
  *
- * @since 5.0.0
- *
  * @group blocks
  */
 class Tests_Blocks_RenderReusable extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/serialize.php b/tests/phpunit/tests/blocks/serialize.php
index aa28f21209..375219c5b3 100644
--- a/tests/phpunit/tests/blocks/serialize.php
+++ b/tests/phpunit/tests/blocks/serialize.php
@@ -1,13 +1,8 @@
 <?php
 /**
- * Block serialization tests
  *
  * @package WordPress
  * @subpackage Blocks
- * @since 5.3.3
- */
-
-/**
  * Tests for block serialization functions.
  *
  * @since 5.3.3
diff --git a/tests/phpunit/tests/blocks/supportedStyles.php b/tests/phpunit/tests/blocks/supportedStyles.php
index e4e6c37e9e..7e087a02c0 100644
--- a/tests/phpunit/tests/blocks/supportedStyles.php
+++ b/tests/phpunit/tests/blocks/supportedStyles.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * Block supported style tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.6.0
- */
-
-/**
+ * 
  * Test block supported styles.
  *
- * @since 5.6.0
- *
  * @group blocks
  */
 class Tests_Blocks_SupportedStyles extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/wpBlock.php b/tests/phpunit/tests/blocks/wpBlock.php
index 00f5a97b83..dd511cfacf 100644
--- a/tests/phpunit/tests/blocks/wpBlock.php
+++ b/tests/phpunit/tests/blocks/wpBlock.php
@@ -1,17 +1,10 @@
 <?php
 /**
- * WP_Block tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.5.0
- */
-
-/**
  * Tests for WP_Block.
  *
- * @since 5.5.0
- *
  * @group blocks
  */
 class Tests_Blocks_wpBlock extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/wpBlockList.php b/tests/phpunit/tests/blocks/wpBlockList.php
index e3755a9cd2..968f7fffd0 100644
--- a/tests/phpunit/tests/blocks/wpBlockList.php
+++ b/tests/phpunit/tests/blocks/wpBlockList.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * WP_Block_List tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.5.0
- */
-
-/**
+ * 
  * Tests for WP_Block_List.
  *
- * @since 5.5.0
- *
  * @group blocks
  */
 class Tests_Blocks_wpBlockList extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/wpBlockParser.php b/tests/phpunit/tests/blocks/wpBlockParser.php
index 8169d4f610..aaeabe2c26 100644
--- a/tests/phpunit/tests/blocks/wpBlockParser.php
+++ b/tests/phpunit/tests/blocks/wpBlockParser.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * WP_Block_Parser tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
+ * 
  * Tests for WP_Block_Parser.
  *
- * @since 5.0.0
- *
  * @group blocks
  */
 class Tests_Blocks_wpBlockParser extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/wpBlockType.php b/tests/phpunit/tests/blocks/wpBlockType.php
index 8ba94be4f5..f05612e517 100644
--- a/tests/phpunit/tests/blocks/wpBlockType.php
+++ b/tests/phpunit/tests/blocks/wpBlockType.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * WP_Block_Type tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
+ * 
  * Tests for WP_Block_Type.
  *
- * @since 5.0.0
- *
  * @group blocks
  */
 class Tests_Blocks_wpBlockType extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php b/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
index 4d384dc725..9de882a92b 100644
--- a/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
+++ b/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * WP_Block_Type_Registry tests
- *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
+ * 
  * Tests for WP_Block_Type_Registry.
  *
- * @since 5.0.0
- *
  * @group blocks
  */
 class Tests_Blocks_wpBlockTypeRegistry extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/comment/isAvatarCommentType.php b/tests/phpunit/tests/comment/isAvatarCommentType.php
index 57ed593b1b..12dbf0c33c 100644
--- a/tests/phpunit/tests/comment/isAvatarCommentType.php
+++ b/tests/phpunit/tests/comment/isAvatarCommentType.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress\UnitTests
  *
- * @since 5.1.0
- */
-
-/**
- * Tests_Comment_IsAvatarCommentType class.
- *
  * @group comment
  *
  * @since 5.1.0
diff --git a/tests/phpunit/tests/customize/control.php b/tests/phpunit/tests/customize/control.php
index 2131bdc844..72b3f06833 100644
--- a/tests/phpunit/tests/customize/control.php
+++ b/tests/phpunit/tests/customize/control.php
@@ -1,12 +1,6 @@
 <?php
 /**
- * Test_WP_Customize_Control tests.
- *
  * @package WordPress
- */
-
-/**
- * Tests for the Test_WP_Customize_Control class.
  *
  * @todo This is missing dedicated tests for all but one of the methods.
  *
diff --git a/tests/phpunit/tests/customize/partial.php b/tests/phpunit/tests/customize/partial.php
index 5e173a8acf..8d4e04cb8d 100644
--- a/tests/phpunit/tests/customize/partial.php
+++ b/tests/phpunit/tests/customize/partial.php
@@ -1,12 +1,6 @@
 <?php
 /**
- * Test_WP_Customize_Partial tests.
- *
  * @package WordPress
- */
-
-/**
- * Tests for the Test_WP_Customize_Partial class.
  *
  * @group customize
  */
diff --git a/tests/phpunit/tests/customize/selective-refresh-ajax.php b/tests/phpunit/tests/customize/selective-refresh-ajax.php
index 040697d419..a196b08d9d 100644
--- a/tests/phpunit/tests/customize/selective-refresh-ajax.php
+++ b/tests/phpunit/tests/customize/selective-refresh-ajax.php
@@ -4,10 +4,6 @@
  *
  * @package    WordPress
  * @subpackage UnitTests
- */
-
-/**
- * Tests for the WP_Customize_Selective_Refresh class Ajax.
  *
  * Note that this is intentionally not extending WP_Ajax_UnitTestCase because it
  * is not admin ajax.
diff --git a/tests/phpunit/tests/customize/selective-refresh.php b/tests/phpunit/tests/customize/selective-refresh.php
index b3cf7fd84a..567320afa2 100644
--- a/tests/phpunit/tests/customize/selective-refresh.php
+++ b/tests/phpunit/tests/customize/selective-refresh.php
@@ -3,10 +3,6 @@
  * WP_Customize_Selective_Refresh tests.
  *
  * @package WordPress
- */
-
-/**
- * Tests for the WP_Customize_Selective_Refresh class.
  *
  * @group customize
  */
diff --git a/tests/phpunit/tests/feed/wpSimplePieFile.php b/tests/phpunit/tests/feed/wpSimplePieFile.php
index 7af366b3cc..426ae58553 100644
--- a/tests/phpunit/tests/feed/wpSimplePieFile.php
+++ b/tests/phpunit/tests/feed/wpSimplePieFile.php
@@ -1,19 +1,11 @@
 <?php
 /**
- * Unit tests for methods in `WP_SimplePie_File`.
- *
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.6.1
- */
-
-/**
- * Tests the `WP_SimplePie_File` class.
  *
  * @group feed
  * @group wp-simplepie-file
- *
- * @since 5.6.1
  */
 class Tests_Feed_wpSimplePieFile extends WP_UnitTestCase {
 	public static function set_up_before_class() {
diff --git a/tests/phpunit/tests/functions/anonymization.php b/tests/phpunit/tests/functions/anonymization.php
index 3e0cea6fa7..89dd0fadd9 100644
--- a/tests/phpunit/tests/functions/anonymization.php
+++ b/tests/phpunit/tests/functions/anonymization.php
@@ -1,17 +1,7 @@
 <?php
 /**
- * Test anonymization functions.
- *
  * @package WordPress\UnitTests
  *
- * @since 4.9.6
- */
-
-/**
- * Class Tests_Functions_Anonymization.
- *
- * @since 4.9.6
- *
  * @group functions.php
  * @group privacy
  * @covers ::wp_privacy_anonymize_data
diff --git a/tests/phpunit/tests/functions/doEnclose.php b/tests/phpunit/tests/functions/doEnclose.php
index e907f179df..02aa6370a9 100644
--- a/tests/phpunit/tests/functions/doEnclose.php
+++ b/tests/phpunit/tests/functions/doEnclose.php
@@ -5,12 +5,6 @@
  * @package WordPress\UnitTests
  *
  * @since 5.3.0
- */
-
-/**
- * Tests_Functions_DoEnclose class.
- *
- * @since 5.3.0
  *
  * @group functions.php
  * @group post
diff --git a/tests/phpunit/tests/link/getThePrivacyPolicyLink.php b/tests/phpunit/tests/link/getThePrivacyPolicyLink.php
index 316ad150ae..55237e33ce 100644
--- a/tests/phpunit/tests/link/getThePrivacyPolicyLink.php
+++ b/tests/phpunit/tests/link/getThePrivacyPolicyLink.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * Define a class to test the `get_the_privacy_policy_link()` function.
- *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
+ * 
  * Test cases for the `get_the_privacy_policy_link()` function.
  *
  * @group link
  * @group privacy
  * @covers ::get_the_privacy_policy_link
- *
- * @since 4.9.6
  */
 class Tests_Link_GetThePrivacyPolicyLink extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/load/wpDebugMode.php b/tests/phpunit/tests/load/wpDebugMode.php
index d527235e55..f873ad9069 100644
--- a/tests/phpunit/tests/load/wpDebugMode.php
+++ b/tests/phpunit/tests/load/wpDebugMode.php
@@ -6,16 +6,10 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.9.0
- */
-
-/**
- * Class Test_WP_Debug_Mode.
  *
  * @group load.php
  * @group wp-debug-mode
  * @covers ::wp_debug_mode
- *
- * @since 5.9.0
  */
 class Test_WP_Debug_Mode extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpCreateUserRequest.php b/tests/phpunit/tests/privacy/wpCreateUserRequest.php
index 9c6d9f3516..55eb866722 100644
--- a/tests/phpunit/tests/privacy/wpCreateUserRequest.php
+++ b/tests/phpunit/tests/privacy/wpCreateUserRequest.php
@@ -1,19 +1,13 @@
 <?php
 /**
- * Test the `wp_create_user_request()` function.
+ * Test cases for the `wp_create_user_request()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Privacy_wpCreateUserRequest class.
  *
  * @group privacy
  * @covers ::wp_create_user_request
- *
- * @since 5.2.0
  */
 class Tests_Privacy_wpCreateUserRequest extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php b/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php
index eb3ae8a2df..0efa6eee45 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php
@@ -1,19 +1,13 @@
 <?php
 /**
- * Test the `_wp_privacy_completed_request()` function.
+ * Test cases for the `_wp_privacy_completed_request()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
- * Tests_Privacy_wpPrivacyCompletedRequest class.
  *
  * @group privacy
  * @covers ::_wp_privacy_completed_request
- *
- * @since 4.9.6
  */
 class Tests_Privacy_wpPrivacyCompletedRequest extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php b/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php
index 8694468268..b13f167d62 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php
@@ -1,19 +1,14 @@
 <?php
 /**
- * Define a class to test `wp_privacy_delete_old_export_files()`.
+ * Test cases for `wp_privacy_delete_old_export_files()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
  * Test cases for `wp_privacy_delete_old_export_files()`.
  *
  * @group privacy
  * @covers ::wp_privacy_delete_old_export_files
- *
- * @since 4.9.6
  */
 class Tests_Privacy_wpPrivacyDeleteOldExportFiles extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php
index 784845821e..9d19ee7949 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php
@@ -1,14 +1,8 @@
 <?php
 /**
- * Define a class to test `wp_privacy_generate_personal_data_export_file()`.
- *
+ * Test cases for the `wp_privacy_delete_old_export_files()` function.
  * @package WordPress
  * @subpackage UnitTests
- * @since 5.2.0
- */
-
-/**
- * Test cases for `wp_privacy_generate_personal_data_export_file()`.
  *
  * @group privacy
  * @covers ::wp_privacy_generate_personal_data_export_file
diff --git a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php
index f85186d0c5..5cff95382c 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Privacy_wpPrivacyGeneratePersonalDataExportGroupHtml class.
  *
  * @group privacy
  * @covers ::wp_privacy_generate_personal_data_export_group_html
- *
- * @since 5.2.0
  */
 class Tests_Privacy_wpPrivacyGeneratePersonalDataExportGroupHtml extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php b/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
index e8d94d4a77..3f7f7074e6 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Privacy_wpPrivacyProcessPersonalDataExportPage class.
  *
  * @group privacy
  * @covers ::wp_privacy_process_personal_data_export_page
- *
- * @since 5.2.0
  */
 class Tests_Privacy_wpPrivacyProcessPersonalDataExportPage extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php b/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php
index ef71a5f85d..401528a158 100644
--- a/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php
+++ b/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.1.0
- */
-
-/**
- * Tests_Privacy_wpPrivacySendErasureFulfillmentNotification class.
  *
  * @group privacy
  * @covers ::_wp_privacy_send_erasure_fulfillment_notification
- *
- * @since 5.1.0
  */
 class Tests_Privacy_wpPrivacySendErasureFulfillmentNotification extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php b/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php
index 5c9336ad97..a0f4c96d29 100644
--- a/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php
+++ b/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
- * Tests_Privacy_wpPrivacySendPersonalDataExportEmail class.
  *
  * @group privacy
  * @covers ::wp_privacy_send_personal_data_export_email
- *
- * @since 4.9.6
  */
 class Tests_Privacy_wpPrivacySendPersonalDataExportEmail extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php b/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php
index ee083b30c6..5374cd5701 100644
--- a/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php
+++ b/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php
@@ -5,16 +5,10 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.8
- */
-
-/**
- * Tests_Privacy_wpPrivacySendRequestConfirmationNotification class.
  *
  * @group privacy
  * @group user
  * @covers ::_wp_privacy_send_request_confirmation_notification
- *
- * @since 4.9.8
  */
 class Tests_Privacy_wpPrivacySendRequestConfirmationNotification extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/rest-api/application-passwords.php b/tests/phpunit/tests/rest-api/application-passwords.php
index b3edab0d72..a630719ee8 100644
--- a/tests/phpunit/tests/rest-api/application-passwords.php
+++ b/tests/phpunit/tests/rest-api/application-passwords.php
@@ -4,9 +4,7 @@
  *
  * @package    WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group  restapi
  * @group  app_password
  */
diff --git a/tests/phpunit/tests/rest-api/rest-request.php b/tests/phpunit/tests/rest-api/rest-request.php
index cf1f3ac739..a3f4f86881 100644
--- a/tests/phpunit/tests/rest-api/rest-request.php
+++ b/tests/phpunit/tests/rest-api/rest-request.php
@@ -4,9 +4,6 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
  * @group restapi
  */
 class Tests_REST_Request extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/rest-api/rest-server.php b/tests/phpunit/tests/rest-api/rest-server.php
index 8788a72445..bad7435916 100644
--- a/tests/phpunit/tests/rest-api/rest-server.php
+++ b/tests/phpunit/tests/rest-api/rest-server.php
@@ -4,9 +4,6 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
  * @group restapi
  */
 class Tests_REST_Server extends WP_Test_REST_TestCase {
diff --git a/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php b/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php
index 256eabdb82..b479d7509f 100644
--- a/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * Unit tests covering WP_Block_Pattern_Categories_Registry functionality.
- *
  * @package    WordPress
  * @subpackage REST_API
  * @since      6.0.0
- */
-
-/**
+ * 
  * Tests for REST API for Block Pattern Categories Registry.
  *
- * @since 6.0.0
- *
  * @ticket 55505
  *
  * @covers WP_REST_Block_Pattern_Categories_Controller
diff --git a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php
index 5447c2ee7b..a36d918230 100644
--- a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * Unit tests covering WP_REST_Block_Patterns_Controller functionality.
- *
  * @package    WordPress
  * @subpackage REST_API
  * @since      6.0.0
- */
-
-/**
+ * 
  * Tests for REST API for Block Patterns.
  *
- * @since 6.0.0
- *
  * @ticket 55505
  *
  * @covers WP_REST_Block_Patterns_Controller
diff --git a/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php b/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php
index c32ea170b8..9f50f76b2d 100644
--- a/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php
+++ b/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * WP_REST_Edit_Site_Export_Controller tests.
- *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
+ * 
  * Tests for WP_REST_Edit_Site_Export_Controller.
  *
- * @since 5.9.0
- *
  * @covers WP_REST_Edit_Site_Export_Controller
  *
  * @group restapi
diff --git a/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php b/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php
index cda306409b..8e02bc5854 100644
--- a/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php
@@ -1,13 +1,9 @@
 <?php
 /**
- * WP_REST_Menu_Items_Controller tests
- *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
+ * 
  * Tests for REST API for Menu items.
  *
  * @group restapi
diff --git a/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php b/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php
index c24714ea93..048ec2ce04 100644
--- a/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php
@@ -1,13 +1,9 @@
 <?php
 /**
- * WP_REST_Menu_Locations_Controller tests.
- *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
+ * 
  * Tests for REST API for Menu locations.
  *
  * @group restapi
diff --git a/tests/phpunit/tests/rest-api/wpRestMenusController.php b/tests/phpunit/tests/rest-api/wpRestMenusController.php
index 3db23f2d45..c0fdb71653 100644
--- a/tests/phpunit/tests/rest-api/wpRestMenusController.php
+++ b/tests/phpunit/tests/rest-api/wpRestMenusController.php
@@ -1,13 +1,9 @@
 <?php
 /**
- * WP_REST_Menus_Controller tests
- *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
+ * 
  * Tests for REST API for Menus.
  *
  * @group restapi
diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index 718cd2f286..6678a249fa 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -1,12 +1,7 @@
 <?php
 /**
- * Unit tests covering the templates endpoint..
- *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
  * Tests for REST API for templates.
  *
  * @covers WP_REST_Templates_Controller
diff --git a/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php b/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php
index 41d0438a57..0de7d9da3f 100644
--- a/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * WP_REST_URL_Details_Controller tests.
- *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
+ * 
  * Tests for WP_REST_URL_Details_Controller.
  *
- * @since 5.9.0
- *
  * @covers WP_REST_URL_Details_Controller
  *
  * @group url-details
diff --git a/tests/phpunit/tests/robots.php b/tests/phpunit/tests/robots.php
index 60da725e75..bfe14d8644 100644
--- a/tests/phpunit/tests/robots.php
+++ b/tests/phpunit/tests/robots.php
@@ -3,9 +3,7 @@
  * Robots functions tests.
  *
  * @package WordPress
- */
-
-/**
+ * 
  * Tests for robots template functions and filters.
  *
  * @group robots
diff --git a/tests/phpunit/tests/url/getPrivacyPolicyUrl.php b/tests/phpunit/tests/url/getPrivacyPolicyUrl.php
index ad0c9c1f00..d44952ed2f 100644
--- a/tests/phpunit/tests/url/getPrivacyPolicyUrl.php
+++ b/tests/phpunit/tests/url/getPrivacyPolicyUrl.php
@@ -1,20 +1,15 @@
 <?php
 /**
- * Define a class to test `get_privacy_policy_url()`.
+ * Test cases for `get_privacy_policy_url()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
  * Test cases for `get_privacy_policy_url()`.
  *
  * @group url
  * @group privacy
  *
- * @since 4.9.6
- *
  * @covers ::get_privacy_policy_url
  */
 class Tests_Url_GetPrivacyPolicyUrl extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/user/retrievePassword.php b/tests/phpunit/tests/user/retrievePassword.php
index 96a14c408f..861a2d9e96 100644
--- a/tests/phpunit/tests/user/retrievePassword.php
+++ b/tests/phpunit/tests/user/retrievePassword.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress
  * @since 6.0.0
- */
-
-/**
- * Test retrieve_password(), in wp-includes/user.php.
- *
- * @since 6.0.0
  *
  * @group user
  * @covers ::retrieve_password
diff --git a/tests/phpunit/tests/user/wpSendUserRequest.php b/tests/phpunit/tests/user/wpSendUserRequest.php
index f36304bad4..11e3130f22 100644
--- a/tests/phpunit/tests/user/wpSendUserRequest.php
+++ b/tests/phpunit/tests/user/wpSendUserRequest.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress
  * @since 4.9.9
- */
-
-/**
- * Tests_User_WpSendUserRequest class.
- *
- * @since 4.9.9
  *
  * @group privacy
  * @group user