diff --git a/tests/phpunit/tests/admin/includesTheme.php b/tests/phpunit/tests/admin/includesTheme.php
index 9f2fdbc085..ed90cf9514 100644
--- a/tests/phpunit/tests/admin/includesTheme.php
+++ b/tests/phpunit/tests/admin/includesTheme.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @group admin
  * @group themes
  */
 class Tests_Admin_IncludesTheme extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/admin/wpAutomaticUpdater.php b/tests/phpunit/tests/admin/wpAutomaticUpdater.php
index 9eed08e850..db485fe910 100644
--- a/tests/phpunit/tests/admin/wpAutomaticUpdater.php
+++ b/tests/phpunit/tests/admin/wpAutomaticUpdater.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group admin
  * @group upgrade
  *
  * @covers WP_Automatic_Updater
diff --git a/tests/phpunit/tests/admin/wpSiteHealth.php b/tests/phpunit/tests/admin/wpSiteHealth.php
index f8b2e2e0c8..07fe300060 100644
--- a/tests/phpunit/tests/admin/wpSiteHealth.php
+++ b/tests/phpunit/tests/admin/wpSiteHealth.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group admin
  * @group site-health
  *
  * @coversDefaultClass WP_Site_Health
diff --git a/tests/phpunit/tests/admin/wpUserSearch.php b/tests/phpunit/tests/admin/wpUserSearch.php
index e24b4d0c6a..4ad20f77c4 100644
--- a/tests/phpunit/tests/admin/wpUserSearch.php
+++ b/tests/phpunit/tests/admin/wpUserSearch.php
@@ -1,5 +1,8 @@
 <?php
 /**
+ * @group admin
+ * @group user
+ *
  * @coversDefaultClass WP_User_Search
  */
 class Tests_Admin_wpUserSearch extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/admin/wpUsersListTable.php b/tests/phpunit/tests/admin/wpUsersListTable.php
index bdf765fbfe..17438d074c 100644
--- a/tests/phpunit/tests/admin/wpUsersListTable.php
+++ b/tests/phpunit/tests/admin/wpUsersListTable.php
@@ -2,6 +2,7 @@
 
 /**
  * @group admin
+ * @group user
  *
  * @covers WP_Users_List_Table
  */
diff --git a/tests/phpunit/tests/block-supports/duotone.php b/tests/phpunit/tests/block-supports/duotone.php
index 2077ef705b..1a949ad24a 100644
--- a/tests/phpunit/tests/block-supports/duotone.php
+++ b/tests/phpunit/tests/block-supports/duotone.php
@@ -3,6 +3,8 @@
 /**
  * Test the block WP_Duotone class.
  *
+ * @group block-supports
+ *
  * @package WordPress
  */
 
diff --git a/tests/phpunit/tests/blocks/getBlockTemplates.php b/tests/phpunit/tests/blocks/getBlockTemplates.php
index 9b1729f93b..92e0f14821 100644
--- a/tests/phpunit/tests/blocks/getBlockTemplates.php
+++ b/tests/phpunit/tests/blocks/getBlockTemplates.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @group blocks
  * @group block-templates
  *
  * @covers ::get_block_templates
diff --git a/tests/phpunit/tests/canonical/category.php b/tests/phpunit/tests/canonical/category.php
index a7923b573c..9619d708ca 100644
--- a/tests/phpunit/tests/canonical/category.php
+++ b/tests/phpunit/tests/canonical/category.php
@@ -2,6 +2,8 @@
 
 /**
  * @group canonical
+ * @group rewrite
+ * @group query
  */
 class Tests_Canonical_Category extends WP_Canonical_UnitTestCase {
 	public $structure = '/%category%/%postname%/';
diff --git a/tests/phpunit/tests/canonical/stripFragmentFromUrl.php b/tests/phpunit/tests/canonical/stripFragmentFromUrl.php
index 053ad88528..efb54d26a2 100644
--- a/tests/phpunit/tests/canonical/stripFragmentFromUrl.php
+++ b/tests/phpunit/tests/canonical/stripFragmentFromUrl.php
@@ -4,6 +4,7 @@
  * @group canonical
  * @group rewrite
  * @group query
+ *
  * @covers ::strip_fragment_from_url
  */
 class Tests_Canonical_StripFragmentFromUrl extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/category/categoryDescription.php b/tests/phpunit/tests/category/categoryDescription.php
index a6442cb4b1..5804dee624 100644
--- a/tests/phpunit/tests/category/categoryDescription.php
+++ b/tests/phpunit/tests/category/categoryDescription.php
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category
  *
  * @covers ::category_description
  */
diff --git a/tests/phpunit/tests/category/getAllCategoryIds.php b/tests/phpunit/tests/category/getAllCategoryIds.php
index 21d2fed5ec..3fb8223afa 100644
--- a/tests/phpunit/tests/category/getAllCategoryIds.php
+++ b/tests/phpunit/tests/category/getAllCategoryIds.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::get_all_category_ids
  */
diff --git a/tests/phpunit/tests/category/getCatId.php b/tests/phpunit/tests/category/getCatId.php
index 33709a68d3..ff41a43cac 100644
--- a/tests/phpunit/tests/category/getCatId.php
+++ b/tests/phpunit/tests/category/getCatId.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::get_cat_ID
  */
diff --git a/tests/phpunit/tests/category/getCatName.php b/tests/phpunit/tests/category/getCatName.php
index 1a0364abbc..767164bf58 100644
--- a/tests/phpunit/tests/category/getCatName.php
+++ b/tests/phpunit/tests/category/getCatName.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::get_cat_name
  */
diff --git a/tests/phpunit/tests/category/getCategories.php b/tests/phpunit/tests/category/getCategories.php
index 6beb0f97a3..df44eb92dc 100644
--- a/tests/phpunit/tests/category/getCategories.php
+++ b/tests/phpunit/tests/category/getCategories.php
@@ -2,7 +2,7 @@
 
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::get_categories
  */
diff --git a/tests/phpunit/tests/category/getCategoryByPath.php b/tests/phpunit/tests/category/getCategoryByPath.php
index e4d34f2458..09c943ed30 100644
--- a/tests/phpunit/tests/category/getCategoryByPath.php
+++ b/tests/phpunit/tests/category/getCategoryByPath.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::get_category_by_path
  */
diff --git a/tests/phpunit/tests/category/getCategoryBySlug.php b/tests/phpunit/tests/category/getCategoryBySlug.php
index 58ff5bfb27..d9eaf4be89 100644
--- a/tests/phpunit/tests/category/getCategoryBySlug.php
+++ b/tests/phpunit/tests/category/getCategoryBySlug.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::get_category_by_slug
  */
diff --git a/tests/phpunit/tests/category/getCategoryLink.php b/tests/phpunit/tests/category/getCategoryLink.php
index 268e7c5738..30bf629825 100644
--- a/tests/phpunit/tests/category/getCategoryLink.php
+++ b/tests/phpunit/tests/category/getCategoryLink.php
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category
  *
  * @covers ::get_category_link
  */
diff --git a/tests/phpunit/tests/category/getCategoryParents.php b/tests/phpunit/tests/category/getCategoryParents.php
index faf6630e14..f2b7e83d1d 100644
--- a/tests/phpunit/tests/category/getCategoryParents.php
+++ b/tests/phpunit/tests/category/getCategoryParents.php
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category
  *
  * @covers ::get_category_parents
  */
diff --git a/tests/phpunit/tests/category/getTheCategoryById.php b/tests/phpunit/tests/category/getTheCategoryById.php
index f927c796d8..ab52a269d6 100644
--- a/tests/phpunit/tests/category/getTheCategoryById.php
+++ b/tests/phpunit/tests/category/getTheCategoryById.php
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category
  *
  * @covers ::get_the_category_by_ID
  */
diff --git a/tests/phpunit/tests/category/makeCatCompat.php b/tests/phpunit/tests/category/makeCatCompat.php
index 17999228c5..42d51d0b78 100644
--- a/tests/phpunit/tests/category/makeCatCompat.php
+++ b/tests/phpunit/tests/category/makeCatCompat.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::_make_cat_compat
  */
diff --git a/tests/phpunit/tests/category/walkerCategory.php b/tests/phpunit/tests/category/walkerCategory.php
index 9e1ff4e094..e13ce9bb10 100644
--- a/tests/phpunit/tests/category/walkerCategory.php
+++ b/tests/phpunit/tests/category/walkerCategory.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @group taxonomy
+ * @group category
  * @group walker
  *
  * @covers Walker_Category::start_el
diff --git a/tests/phpunit/tests/category/wpDropdownCategories.php b/tests/phpunit/tests/category/wpDropdownCategories.php
index 19fa298486..9fbe1215f2 100644
--- a/tests/phpunit/tests/category/wpDropdownCategories.php
+++ b/tests/phpunit/tests/category/wpDropdownCategories.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @group taxonomy
- * @group category.php
+ * @group category
  *
  * @covers ::wp_dropdown_categories
  */
diff --git a/tests/phpunit/tests/category/wpListCategories.php b/tests/phpunit/tests/category/wpListCategories.php
index ab76c09fc9..197ce1cf27 100644
--- a/tests/phpunit/tests/category/wpListCategories.php
+++ b/tests/phpunit/tests/category/wpListCategories.php
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category
  *
  * @covers ::wp_list_categories
  */
diff --git a/tests/phpunit/tests/comment/commentForm.php b/tests/phpunit/tests/comment/commentForm.php
index 05a9269ffb..771cbc1b57 100644
--- a/tests/phpunit/tests/comment/commentForm.php
+++ b/tests/phpunit/tests/comment/commentForm.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
  *
  * @covers ::comment_form
  */
diff --git a/tests/phpunit/tests/comment/commentsOpen.php b/tests/phpunit/tests/comment/commentsOpen.php
index 7549498e90..229a6ed935 100644
--- a/tests/phpunit/tests/comment/commentsOpen.php
+++ b/tests/phpunit/tests/comment/commentsOpen.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
+ *
  * @covers ::comments_open
  */
 class Tests_Comment_CommentsOpen extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/comment/commentsTemplate.php b/tests/phpunit/tests/comment/commentsTemplate.php
index cb033a55e3..7fa51f79f9 100644
--- a/tests/phpunit/tests/comment/commentsTemplate.php
+++ b/tests/phpunit/tests/comment/commentsTemplate.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @group comment
- *
  * Testing items that are only testable by grabbing the markup of `comments_template()` from the output buffer.
  *
+ * @group comment
+ *
  * @covers ::comments_template
  */
 class Tests_Comment_CommentsTemplate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/comment/pingsOpen.php b/tests/phpunit/tests/comment/pingsOpen.php
index 93a25d5a73..638f71f1b4 100644
--- a/tests/phpunit/tests/comment/pingsOpen.php
+++ b/tests/phpunit/tests/comment/pingsOpen.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
  * @covers ::pings_open
  */
 class Tests_Comment_PingsOpen extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php b/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php
index 76f890f90f..3436934845 100644
--- a/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php
+++ b/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
  *
  * @covers ::wp_update_comment_count_now
  */
diff --git a/tests/phpunit/tests/customize/selective-refresh-ajax.php b/tests/phpunit/tests/customize/selective-refresh-ajax.php
index cb225498f3..39d3d45a70 100644
--- a/tests/phpunit/tests/customize/selective-refresh-ajax.php
+++ b/tests/phpunit/tests/customize/selective-refresh-ajax.php
@@ -9,6 +9,7 @@
  * @subpackage UnitTests
  * @since 4.5.0
  *
+ * @group customize
  * @group ajax
  */
 class Test_WP_Customize_Selective_Refresh_Ajax extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/currentDatetime.php b/tests/phpunit/tests/date/currentDatetime.php
index 21ef037897..ebb68dc7c0 100644
--- a/tests/phpunit/tests/date/currentDatetime.php
+++ b/tests/phpunit/tests/date/currentDatetime.php
@@ -3,6 +3,7 @@
 /**
  * @group date
  * @group datetime
+ *
  * @covers ::current_datetime
  */
 class Tests_Date_CurrentDatetime extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/currentTime.php b/tests/phpunit/tests/date/currentTime.php
index 66c2fdf3c5..b308f4918f 100644
--- a/tests/phpunit/tests/date/currentTime.php
+++ b/tests/phpunit/tests/date/currentTime.php
@@ -3,6 +3,7 @@
 /**
  * @group date
  * @group datetime
+ *
  * @covers ::current_time
  */
 class Tests_Date_CurrentTime extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/dateI18n.php b/tests/phpunit/tests/date/dateI18n.php
index 544ea9ae47..7423328969 100644
--- a/tests/phpunit/tests/date/dateI18n.php
+++ b/tests/phpunit/tests/date/dateI18n.php
@@ -3,6 +3,7 @@
 /**
  * @group date
  * @group datetime
+ *
  * @covers ::date_i18n
  */
 class Tests_Date_DateI18n extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/getCommentDate.php b/tests/phpunit/tests/date/getCommentDate.php
index 20186bc908..2c25a0e2be 100644
--- a/tests/phpunit/tests/date/getCommentDate.php
+++ b/tests/phpunit/tests/date/getCommentDate.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group comment
+ *
  * @covers ::get_comment_date
  */
 class Tests_Date_GetCommentDate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/getFeedBuildDate.php b/tests/phpunit/tests/date/getFeedBuildDate.php
index 39cfd988d1..d884c0baef 100644
--- a/tests/phpunit/tests/date/getFeedBuildDate.php
+++ b/tests/phpunit/tests/date/getFeedBuildDate.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group feed
+ *
  * @covers ::get_feed_build_date
  */
 class Tests_Date_GetFeedBuildDate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/getPermalink.php b/tests/phpunit/tests/date/getPermalink.php
index 195717dbd8..ff7ddcdb27 100644
--- a/tests/phpunit/tests/date/getPermalink.php
+++ b/tests/phpunit/tests/date/getPermalink.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group post
+ *
  * @covers ::get_permalink
  */
 class Tests_Date_GetPermalink extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/getPostTime.php b/tests/phpunit/tests/date/getPostTime.php
index 441e886210..7aba1879b9 100644
--- a/tests/phpunit/tests/date/getPostTime.php
+++ b/tests/phpunit/tests/date/getPostTime.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group post
+ *
  * @covers ::get_post_time
  * @covers ::get_post_modified_time
  */
diff --git a/tests/phpunit/tests/date/getTheDate.php b/tests/phpunit/tests/date/getTheDate.php
index 18df7b8915..2123021c3b 100644
--- a/tests/phpunit/tests/date/getTheDate.php
+++ b/tests/phpunit/tests/date/getTheDate.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group post
+ *
  * @covers ::get_the_date
  */
 class Tests_Date_GetTheDate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/getTheModifiedDate.php b/tests/phpunit/tests/date/getTheModifiedDate.php
index 7189a7282c..ec834ba8b8 100644
--- a/tests/phpunit/tests/date/getTheModifiedDate.php
+++ b/tests/phpunit/tests/date/getTheModifiedDate.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group post
+ *
  * @covers ::get_the_modified_date
  */
 class Tests_Date_GetTheModifiedDate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/maybeDeclineDate.php b/tests/phpunit/tests/date/maybeDeclineDate.php
index 857bd41af3..4c26d2ae0e 100644
--- a/tests/phpunit/tests/date/maybeDeclineDate.php
+++ b/tests/phpunit/tests/date/maybeDeclineDate.php
@@ -1,9 +1,11 @@
 <?php
 
 /**
- * @group functions.php
- * @group i18n
+ * @group date
  * @group datetime
+ * @group i18n
+ * @group functions
+ *
  * @covers ::wp_maybe_decline_date
  */
 class Tests_Date_MaybeDeclineDate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/mysql2date.php b/tests/phpunit/tests/date/mysql2date.php
index 2ae4939c56..0686bec79e 100644
--- a/tests/phpunit/tests/date/mysql2date.php
+++ b/tests/phpunit/tests/date/mysql2date.php
@@ -3,6 +3,8 @@
 /**
  * @group date
  * @group datetime
+ * @group functions
+ *
  * @covers ::mysql2date
  */
 class Tests_Date_mysql2date extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/query.php b/tests/phpunit/tests/date/query.php
index 2f12d1fe90..4d7b630495 100644
--- a/tests/phpunit/tests/date/query.php
+++ b/tests/phpunit/tests/date/query.php
@@ -5,8 +5,10 @@
  *
  * See query/dateQuery.php for tests that require WP_Query.
  *
- * @group datequery
  * @group date
+ * @group datetime
+ * @group datequery
+ *
  * @covers WP_Date_Query
  */
 class Tests_Date_Query extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/theDate.php b/tests/phpunit/tests/date/theDate.php
index fffcb47ad5..e4bfaabf73 100644
--- a/tests/phpunit/tests/date/theDate.php
+++ b/tests/phpunit/tests/date/theDate.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group post
+ *
  * @covers ::the_date
  * @covers ::the_weekday_date
  */
diff --git a/tests/phpunit/tests/date/wpDate.php b/tests/phpunit/tests/date/wpDate.php
index 341e590a74..c80a2a997b 100644
--- a/tests/phpunit/tests/date/wpDate.php
+++ b/tests/phpunit/tests/date/wpDate.php
@@ -3,6 +3,7 @@
 /**
  * @group date
  * @group datetime
+ *
  * @covers ::wp_date
  */
 class Tests_Date_wpDate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/date/wpTimezone.php b/tests/phpunit/tests/date/wpTimezone.php
index f28ebbf658..d4e7e7e220 100644
--- a/tests/phpunit/tests/date/wpTimezone.php
+++ b/tests/phpunit/tests/date/wpTimezone.php
@@ -3,6 +3,7 @@
 /**
  * @group date
  * @group datetime
+ *
  * @covers ::wp_timezone_string
  * @covers ::wp_timezone
  */
diff --git a/tests/phpunit/tests/date/xmlrpc.php b/tests/phpunit/tests/date/xmlrpc.php
index 63daeb41da..d73e5b1fe9 100644
--- a/tests/phpunit/tests/date/xmlrpc.php
+++ b/tests/phpunit/tests/date/xmlrpc.php
@@ -4,6 +4,7 @@
  * @group date
  * @group datetime
  * @group xmlrpc
+ *
  * @covers IXR_Date
  */
 class Tests_Date_XMLRPC extends WP_XMLRPC_UnitTestCase {
diff --git a/tests/phpunit/tests/db/dbDelta.php b/tests/phpunit/tests/db/dbDelta.php
index b28905749c..bba1fb0524 100644
--- a/tests/phpunit/tests/db/dbDelta.php
+++ b/tests/phpunit/tests/db/dbDelta.php
@@ -3,8 +3,9 @@
 /**
  * Test dbDelta()
  *
- * @group upgrade
+ * @group wpdb
  * @group dbdelta
+ * @group upgrade
  *
  * @covers ::dbDelta
  */
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 9ec6c04183..5b9f83a987 100644
--- a/tests/phpunit/tests/editor/classic-to-block-menu-converter.php
+++ b/tests/phpunit/tests/editor/classic-to-block-menu-converter.php
@@ -7,6 +7,8 @@
 
 /**
  * Tests for the WP_Classic_To_Block_Menu_Converter_Test class.
+ *
+ * @group editor
  */
 class WP_Classic_To_Block_Menu_Converter_Test extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/editor/navigation-fallback.php b/tests/phpunit/tests/editor/navigation-fallback.php
index 6cdf1b35be..7b9f199a32 100644
--- a/tests/phpunit/tests/editor/navigation-fallback.php
+++ b/tests/phpunit/tests/editor/navigation-fallback.php
@@ -7,6 +7,8 @@
 
 /**
  * Tests for the WP_Navigation_Fallback class.
+ *
+ * @group editor
  */
 class WP_Navigation_Fallback_Test extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/filesystem/copyDir.php b/tests/phpunit/tests/filesystem/copyDir.php
index 914e2b867c..ff80273c8a 100644
--- a/tests/phpunit/tests/filesystem/copyDir.php
+++ b/tests/phpunit/tests/filesystem/copyDir.php
@@ -3,7 +3,8 @@
 /**
  * Tests copy_dir().
  *
- * @group file.php
+ * @group file
+ * @group filesystem
  *
  * @covers ::copy_dir
  */
diff --git a/tests/phpunit/tests/filesystem/findFolder.php b/tests/phpunit/tests/filesystem/findFolder.php
index 59e9e8c605..e2be834792 100644
--- a/tests/phpunit/tests/filesystem/findFolder.php
+++ b/tests/phpunit/tests/filesystem/findFolder.php
@@ -3,8 +3,8 @@
 require_once __DIR__ . '/base.php';
 
 /**
+ * @group file
  * @group filesystem
- * @group wp-filesystem
  */
 class WP_Filesystem_Find_Folder_Test extends WP_Filesystem_UnitTestCase {
 
@@ -90,7 +90,7 @@ class WP_Filesystem_Find_Folder_Test extends WP_Filesystem_UnitTestCase {
 			/example.com/www/index.php
 			/example.com/www/wp-includes/
 			/example.com/www/wp-content/plugins/
-			
+
 			# sub.example.com
 			/example.com/sub/index.php
 			/example.com/sub/wp-includes/
diff --git a/tests/phpunit/tests/filesystem/moveDir.php b/tests/phpunit/tests/filesystem/moveDir.php
index d2661fd48d..7def36a5b2 100644
--- a/tests/phpunit/tests/filesystem/moveDir.php
+++ b/tests/phpunit/tests/filesystem/moveDir.php
@@ -3,7 +3,8 @@
 /**
  * Tests move_dir().
  *
- * @group file.php
+ * @group file
+ * @group filesystem
  *
  * @covers ::move_dir
  */
diff --git a/tests/phpunit/tests/filesystem/_unzipFilePclzip.php b/tests/phpunit/tests/filesystem/unzipFilePclzip.php
similarity index 98%
rename from tests/phpunit/tests/filesystem/_unzipFilePclzip.php
rename to tests/phpunit/tests/filesystem/unzipFilePclzip.php
index c3098c6a86..5a195417fe 100644
--- a/tests/phpunit/tests/filesystem/_unzipFilePclzip.php
+++ b/tests/phpunit/tests/filesystem/unzipFilePclzip.php
@@ -3,7 +3,8 @@
 /**
  * Tests _unzip_file_pclzip().
  *
- * @group file.php
+ * @group file
+ * @group filesystem
  *
  * @covers ::_unzip_file_pclzip
  */
diff --git a/tests/phpunit/tests/filesystem/_unzipFileZiparchive.php b/tests/phpunit/tests/filesystem/unzipFileZiparchive.php
similarity index 98%
rename from tests/phpunit/tests/filesystem/_unzipFileZiparchive.php
rename to tests/phpunit/tests/filesystem/unzipFileZiparchive.php
index a9d385d339..53cabd9454 100644
--- a/tests/phpunit/tests/filesystem/_unzipFileZiparchive.php
+++ b/tests/phpunit/tests/filesystem/unzipFileZiparchive.php
@@ -3,7 +3,8 @@
 /**
  * Tests _unzip_file_ziparchive().
  *
- * @group file.php
+ * @group file
+ * @group filesystem
  *
  * @covers ::_unzip_file_ziparchive
  */
diff --git a/tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php b/tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php
index 54c71c7ab0..d0275b5ebf 100644
--- a/tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php
+++ b/tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php
@@ -3,7 +3,8 @@
 /**
  * Tests wp_opcache_invalidate_directory().
  *
- * @group file.php
+ * @group file
+ * @group filesystem
  *
  * @covers ::wp_opcache_invalidate_directory
  */
diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php
index 5c8a1aa25f..cef6a1eaf5 100644
--- a/tests/phpunit/tests/functions.php
+++ b/tests/phpunit/tests/functions.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
  */
 class Tests_Functions extends WP_UnitTestCase {
 	public function test_wp_parse_args_object() {
diff --git a/tests/phpunit/tests/functions/addMagicQuotes.php b/tests/phpunit/tests/functions/addMagicQuotes.php
index 47085efe76..ead7432ab8 100644
--- a/tests/phpunit/tests/functions/addMagicQuotes.php
+++ b/tests/phpunit/tests/functions/addMagicQuotes.php
@@ -2,7 +2,8 @@
 
 /**
  * @group formatting
- * @group functions.php
+ * @group functions
+ *
  * @covers ::add_magic_quotes
  */
 class Tests_Functions_AddMagicQuotes extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/allowedProtocols.php b/tests/phpunit/tests/functions/allowedProtocols.php
index 8484024c86..bbc13d39bd 100644
--- a/tests/phpunit/tests/functions/allowedProtocols.php
+++ b/tests/phpunit/tests/functions/allowedProtocols.php
@@ -2,7 +2,8 @@
 
 /**
  * @group formatting
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_allowed_protocols
  */
 class Tests_Functions_AllowedProtocols extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/anonymization.php b/tests/phpunit/tests/functions/anonymization.php
index 7a4ff6a26b..a9b96e8d1b 100644
--- a/tests/phpunit/tests/functions/anonymization.php
+++ b/tests/phpunit/tests/functions/anonymization.php
@@ -6,8 +6,9 @@
  *
  * @since 4.9.6
  *
- * @group functions.php
+ * @group functions
  * @group privacy
+ *
  * @covers ::wp_privacy_anonymize_data
  */
 class Tests_Functions_Anonymization extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/canonicalCharset.php b/tests/phpunit/tests/functions/canonicalCharset.php
index 4a11e9c764..f13e0cca15 100644
--- a/tests/phpunit/tests/functions/canonicalCharset.php
+++ b/tests/phpunit/tests/functions/canonicalCharset.php
@@ -5,7 +5,8 @@
  *
  * @since 4.8.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::_canonical_charset
  */
 class Tests_Functions_CanonicalCharset extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/cleanDirsizeCache.php b/tests/phpunit/tests/functions/cleanDirsizeCache.php
index c10dc8b97b..f4f1f6a788 100644
--- a/tests/phpunit/tests/functions/cleanDirsizeCache.php
+++ b/tests/phpunit/tests/functions/cleanDirsizeCache.php
@@ -3,7 +3,9 @@
 /**
  * Tests specific to the directory size caching.
  *
- * @group functions.php
+ * @group functions
+ *
+ * @covers ::clean_dirsize_cache
  */
 class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {
 
@@ -12,8 +14,6 @@ class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {
 	 *
 	 * @ticket 52241
 	 *
-	 * @covers ::clean_dirsize_cache
-	 *
 	 * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
 	 *
 	 * @param mixed  $path             Path input to use in the test.
@@ -57,8 +57,6 @@ class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {
 	 *
 	 * @ticket 52241
 	 *
-	 * @covers ::clean_dirsize_cache
-	 *
 	 * @dataProvider data_clean_dirsize_cache_with_non_path_string
 	 *
 	 * @param string $path           Path input to use in the test.
diff --git a/tests/phpunit/tests/functions/cleanupHeaderComment.php b/tests/phpunit/tests/functions/cleanupHeaderComment.php
index 06af432fd1..95c1b88d20 100644
--- a/tests/phpunit/tests/functions/cleanupHeaderComment.php
+++ b/tests/phpunit/tests/functions/cleanupHeaderComment.php
@@ -5,7 +5,8 @@
  * @ticket 8497
  * @ticket 38101
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::_cleanup_header_comment
  */
 class Tests_Functions_CleanupHeaderComment extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/doEnclose.php b/tests/phpunit/tests/functions/doEnclose.php
index d906ed6f61..6d36fd373a 100644
--- a/tests/phpunit/tests/functions/doEnclose.php
+++ b/tests/phpunit/tests/functions/doEnclose.php
@@ -7,8 +7,9 @@
  *
  * @since 5.3.0
  *
- * @group functions.php
+ * @group functions
  * @group post
+ *
  * @covers ::do_enclose
  */
 class Tests_Functions_DoEnclose extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/getNonCachedIds.php b/tests/phpunit/tests/functions/getNonCachedIds.php
index 07943bbdc8..0f6b93227d 100644
--- a/tests/phpunit/tests/functions/getNonCachedIds.php
+++ b/tests/phpunit/tests/functions/getNonCachedIds.php
@@ -4,6 +4,7 @@
  *
  * @package WordPress
  *
+ * @group functions
  * @group cache
  *
  * @covers ::_get_non_cached_ids
diff --git a/tests/phpunit/tests/functions/getStatusHeaderDesc.php b/tests/phpunit/tests/functions/getStatusHeaderDesc.php
index c3826c5dc8..e3561f9b20 100644
--- a/tests/phpunit/tests/functions/getStatusHeaderDesc.php
+++ b/tests/phpunit/tests/functions/getStatusHeaderDesc.php
@@ -5,7 +5,8 @@
  *
  * @since 5.3.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::get_status_header_desc
  */
 class Tests_Functions_GetStatusHeaderDesc extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/getWeekstartend.php b/tests/phpunit/tests/functions/getWeekstartend.php
index 3b162b8401..45d10a9253 100644
--- a/tests/phpunit/tests/functions/getWeekstartend.php
+++ b/tests/phpunit/tests/functions/getWeekstartend.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
+ *
  * @covers ::get_weekstartend
  */
 class Tests_Functions_GetWeekstartend extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/isNewDay.php b/tests/phpunit/tests/functions/isNewDay.php
index b1993e09e1..0a25699e97 100644
--- a/tests/phpunit/tests/functions/isNewDay.php
+++ b/tests/phpunit/tests/functions/isNewDay.php
@@ -4,7 +4,8 @@
  *
  * @since 5.2.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::is_new_day
  */
 class Tests_Functions_IsNewDate extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/isPhpVersionCompatible.php b/tests/phpunit/tests/functions/isPhpVersionCompatible.php
index e455cde9ef..4aab9f5fae 100644
--- a/tests/phpunit/tests/functions/isPhpVersionCompatible.php
+++ b/tests/phpunit/tests/functions/isPhpVersionCompatible.php
@@ -3,7 +3,8 @@
 /**
  * Tests the is_php_version_compatible() function.
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::is_php_version_compatible
  */
 class Tests_Functions_IsPhpVersionCompatible extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/isSerialized.php b/tests/phpunit/tests/functions/isSerialized.php
index 8ecbd5273c..ff6a2f8786 100644
--- a/tests/phpunit/tests/functions/isSerialized.php
+++ b/tests/phpunit/tests/functions/isSerialized.php
@@ -5,7 +5,8 @@
  *
  * @ticket 53299
  *
- * @group functions.php
+ * @group function
+ *
  * @covers ::is_serialized
  */
 class Tests_Functions_IsSerialized extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/isSerializedString.php b/tests/phpunit/tests/functions/isSerializedString.php
index f8f33a2c33..0233c039c3 100644
--- a/tests/phpunit/tests/functions/isSerializedString.php
+++ b/tests/phpunit/tests/functions/isSerializedString.php
@@ -5,7 +5,8 @@
  *
  * @ticket 42870
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::is_serialized_string
  */
 class Tests_Functions_IsSerializedString extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/isWpVersionCompatible.php b/tests/phpunit/tests/functions/isWpVersionCompatible.php
index 6a6b424e92..a6491b66e8 100644
--- a/tests/phpunit/tests/functions/isWpVersionCompatible.php
+++ b/tests/phpunit/tests/functions/isWpVersionCompatible.php
@@ -3,7 +3,8 @@
 /**
  * Tests the is_wp_version_compatible() function.
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::is_wp_version_compatible
  */
 class Tests_Functions_IsWpVersionCompatible extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/listFiles.php b/tests/phpunit/tests/functions/listFiles.php
index bfdd080f8b..a7e7346956 100644
--- a/tests/phpunit/tests/functions/listFiles.php
+++ b/tests/phpunit/tests/functions/listFiles.php
@@ -3,7 +3,8 @@
 /**
  * Test list_files().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::list_files
  */
 class Tests_Functions_ListFiles extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/maybeSerialize.php b/tests/phpunit/tests/functions/maybeSerialize.php
index e8986d9818..4a4b762b3e 100644
--- a/tests/phpunit/tests/functions/maybeSerialize.php
+++ b/tests/phpunit/tests/functions/maybeSerialize.php
@@ -3,7 +3,8 @@
 /**
  * Tests for `maybe_serialize()` and `maybe_unserialize()`.
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::maybe_serialize
  * @covers ::maybe_unserialize
  */
diff --git a/tests/phpunit/tests/functions/numberFormatI18n.php b/tests/phpunit/tests/functions/numberFormatI18n.php
index c57405887d..fbddcacf7b 100644
--- a/tests/phpunit/tests/functions/numberFormatI18n.php
+++ b/tests/phpunit/tests/functions/numberFormatI18n.php
@@ -3,8 +3,9 @@
 /**
  * Tests for number_format_i18n()
  *
- * @group functions.php
+ * @group functions
  * @group i18n
+ *
  * @covers ::number_format_i18n
  */
 class Tests_Functions_NumberFormatI18n extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/pluginBasename.php b/tests/phpunit/tests/functions/pluginBasename.php
index d28cf914cf..38a10e2668 100644
--- a/tests/phpunit/tests/functions/pluginBasename.php
+++ b/tests/phpunit/tests/functions/pluginBasename.php
@@ -3,8 +3,9 @@
 /**
  * Tests for plugin_basename()
  *
- * @group functions.php
+ * @group function
  * @group plugins
+ *
  * @covers ::plugin_basename
  */
 class Tests_Functions_PluginBasename extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/referer.php b/tests/phpunit/tests/functions/referer.php
index 0abe528c48..d73360a0a0 100644
--- a/tests/phpunit/tests/functions/referer.php
+++ b/tests/phpunit/tests/functions/referer.php
@@ -3,7 +3,8 @@
 /**
  * Test wp_get_referer().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_get_referer
  * @covers ::wp_get_raw_referer
  */
diff --git a/tests/phpunit/tests/functions/removeQueryArg.php b/tests/phpunit/tests/functions/removeQueryArg.php
index 8d05a6c230..8a13874ce1 100644
--- a/tests/phpunit/tests/functions/removeQueryArg.php
+++ b/tests/phpunit/tests/functions/removeQueryArg.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
+ *
  * @covers ::remove_query_arg
  */
 class Tests_Functions_RemoveQueryArg extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/sizeFormat.php b/tests/phpunit/tests/functions/sizeFormat.php
index bed09d15aa..f46e462258 100644
--- a/tests/phpunit/tests/functions/sizeFormat.php
+++ b/tests/phpunit/tests/functions/sizeFormat.php
@@ -7,7 +7,8 @@
  * @ticket 36635
  * @ticket 40875
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::size_format
  */
 class Tests_Functions_SizeFormat extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/underscoreReturn.php b/tests/phpunit/tests/functions/underscoreReturn.php
index 4973c2d328..86c6ca1e45 100644
--- a/tests/phpunit/tests/functions/underscoreReturn.php
+++ b/tests/phpunit/tests/functions/underscoreReturn.php
@@ -4,7 +4,7 @@
  *
  * @since 5.1.0
  *
- * @group functions.php
+ * @group functions
  */
 class Tests_Functions_UnderscoreReturn extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/functions/wp.php b/tests/phpunit/tests/functions/wp.php
index 14356a4ebc..984e754fc9 100644
--- a/tests/phpunit/tests/functions/wp.php
+++ b/tests/phpunit/tests/functions/wp.php
@@ -1,8 +1,9 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
  * @group query
+ *
  * @covers ::wp
  */
 class Tests_Functions_WP extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpAdminNotice.php b/tests/phpunit/tests/functions/wpAdminNotice.php
index 2756ab1de9..fd0ef6c44f 100644
--- a/tests/phpunit/tests/functions/wpAdminNotice.php
+++ b/tests/phpunit/tests/functions/wpAdminNotice.php
@@ -3,7 +3,7 @@
 /**
  * Tests for `wp_admin_notice()`.
  *
- * @group functions.php
+ * @group functions
  *
  * @covers ::wp_admin_notice
  */
diff --git a/tests/phpunit/tests/functions/wpArrayGet.php b/tests/phpunit/tests/functions/wpArrayGet.php
index 4249aa9b70..0c12cfba9b 100644
--- a/tests/phpunit/tests/functions/wpArrayGet.php
+++ b/tests/phpunit/tests/functions/wpArrayGet.php
@@ -5,7 +5,8 @@
  *
  * @since 5.6.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::_wp_array_get
  */
 class Tests_Functions_wpArrayGet extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpArraySet.php b/tests/phpunit/tests/functions/wpArraySet.php
index 568ef637f1..159565bf8e 100644
--- a/tests/phpunit/tests/functions/wpArraySet.php
+++ b/tests/phpunit/tests/functions/wpArraySet.php
@@ -5,7 +5,8 @@
  *
  * @since 5.8.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::_wp_array_set
  */
 class Tests_Functions_wpArraySet extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpArraySliceAssoc.php b/tests/phpunit/tests/functions/wpArraySliceAssoc.php
index f4f2c503e8..17326c5a92 100644
--- a/tests/phpunit/tests/functions/wpArraySliceAssoc.php
+++ b/tests/phpunit/tests/functions/wpArraySliceAssoc.php
@@ -5,7 +5,8 @@
  *
  * @since 5.3.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_array_slice_assoc
  */
 class Tests_Functions_wpArraySliceAssoc extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpAuthCheck.php b/tests/phpunit/tests/functions/wpAuthCheck.php
index 70c1780faa..639634b2b7 100644
--- a/tests/phpunit/tests/functions/wpAuthCheck.php
+++ b/tests/phpunit/tests/functions/wpAuthCheck.php
@@ -3,7 +3,8 @@
 /**
  * Tests for the behavior of `wp_auth_check()`
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::is_user_logged_in
  * @covers ::wp_auth_check
  */
diff --git a/tests/phpunit/tests/functions/wpCheckAlternateFileNames.php b/tests/phpunit/tests/functions/wpCheckAlternateFileNames.php
index c21ae3374d..47a99244d7 100644
--- a/tests/phpunit/tests/functions/wpCheckAlternateFileNames.php
+++ b/tests/phpunit/tests/functions/wpCheckAlternateFileNames.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
+ *
  * @covers ::_wp_check_alternate_file_names
  */
 class Tests_Functions_WpCheckAlternateFileNames extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpCheckFiletype.php b/tests/phpunit/tests/functions/wpCheckFiletype.php
index ad947c628b..7946ca5752 100644
--- a/tests/phpunit/tests/functions/wpCheckFiletype.php
+++ b/tests/phpunit/tests/functions/wpCheckFiletype.php
@@ -3,7 +3,7 @@
 /**
  * Tests for wp_check_filetype().
  *
- * @group functions.php
+ * @group functions
  * @group upload
  *
  * @covers ::wp_check_filetype
diff --git a/tests/phpunit/tests/functions/wpFilesize.php b/tests/phpunit/tests/functions/wpFilesize.php
index 250f7e79c7..4ed6de5676 100644
--- a/tests/phpunit/tests/functions/wpFilesize.php
+++ b/tests/phpunit/tests/functions/wpFilesize.php
@@ -3,7 +3,8 @@
 /**
  * Tests for the wp_filesize() function.
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_filesize
  */
 class Tests_Functions_wpFilesize extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpFilterObjectList.php b/tests/phpunit/tests/functions/wpFilterObjectList.php
index b0c9edc4ed..21b633e352 100644
--- a/tests/phpunit/tests/functions/wpFilterObjectList.php
+++ b/tests/phpunit/tests/functions/wpFilterObjectList.php
@@ -3,7 +3,7 @@
 /**
  * Test wp_filter_object_list().
  *
- * @group functions.php
+ * @group functions
  * @covers ::wp_filter_object_list
  */
 class Tests_Functions_wpFilterObjectList extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php b/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php
index 77a06e2bb7..1935edefef 100644
--- a/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php
+++ b/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php
@@ -3,7 +3,8 @@
 /**
  * Test wp_fuzzy_number_match().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_fuzzy_number_match
  */
 class Tests_Functions_wpFuzzyNumberMatch extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpGetAdminNotice.php b/tests/phpunit/tests/functions/wpGetAdminNotice.php
index aeeadff96d..2aacdba7fe 100644
--- a/tests/phpunit/tests/functions/wpGetAdminNotice.php
+++ b/tests/phpunit/tests/functions/wpGetAdminNotice.php
@@ -3,7 +3,7 @@
 /**
  * Tests for `wp_get_admin_notice()`.
  *
- * @group functions.php
+ * @group functions
  *
  * @covers ::wp_get_admin_notice
  */
diff --git a/tests/phpunit/tests/functions/wpGetArchives.php b/tests/phpunit/tests/functions/wpGetArchives.php
index 6d0eaded28..b12fe262e8 100644
--- a/tests/phpunit/tests/functions/wpGetArchives.php
+++ b/tests/phpunit/tests/functions/wpGetArchives.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_get_archives
  */
 class Tests_Functions_wpGetArchives extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpGetMimeTypes.php b/tests/phpunit/tests/functions/wpGetMimeTypes.php
index 2bef07644f..8bcd0aed8a 100644
--- a/tests/phpunit/tests/functions/wpGetMimeTypes.php
+++ b/tests/phpunit/tests/functions/wpGetMimeTypes.php
@@ -3,7 +3,8 @@
 /**
  * Test wp_get_mime_types().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_get_mime_types
  */
 class Tests_Functions_wpGetMimeTypes extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpGuessUrl.php b/tests/phpunit/tests/functions/wpGuessUrl.php
index cfa21bb4d3..005d721929 100644
--- a/tests/phpunit/tests/functions/wpGuessUrl.php
+++ b/tests/phpunit/tests/functions/wpGuessUrl.php
@@ -3,7 +3,8 @@
 /**
  * Test wp_guess_url().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_guess_url
  */
 class Tests_Functions_wpGuessUrl extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpIsNumericArray.php b/tests/phpunit/tests/functions/wpIsNumericArray.php
index 309f901e35..4eeab0af81 100644
--- a/tests/phpunit/tests/functions/wpIsNumericArray.php
+++ b/tests/phpunit/tests/functions/wpIsNumericArray.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_is_numeric_array
  */
 class Tests_Functions_wpIsNumericArray extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpListFilter.php b/tests/phpunit/tests/functions/wpListFilter.php
index 042325227e..44e5335513 100644
--- a/tests/phpunit/tests/functions/wpListFilter.php
+++ b/tests/phpunit/tests/functions/wpListFilter.php
@@ -3,7 +3,8 @@
 /**
  * Test wp_list_filter().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_list_filter
  */
 class Tests_Functions_wpListFilter extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpListPluck.php b/tests/phpunit/tests/functions/wpListPluck.php
index cb3c4bfe27..aca29506a9 100644
--- a/tests/phpunit/tests/functions/wpListPluck.php
+++ b/tests/phpunit/tests/functions/wpListPluck.php
@@ -3,7 +3,8 @@
 /**
  * Test wp_list_pluck().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_list_pluck
  */
 class Tests_Functions_wpListPluck extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpListSort.php b/tests/phpunit/tests/functions/wpListSort.php
index 63c495dd84..f39720583a 100644
--- a/tests/phpunit/tests/functions/wpListSort.php
+++ b/tests/phpunit/tests/functions/wpListSort.php
@@ -3,7 +3,8 @@
 /**
  * Test wp_list_sort().
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_list_sort
  */
 class Tests_Functions_wpListSort extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpListUtil.php b/tests/phpunit/tests/functions/wpListUtil.php
index dba0a12797..628198929d 100644
--- a/tests/phpunit/tests/functions/wpListUtil.php
+++ b/tests/phpunit/tests/functions/wpListUtil.php
@@ -3,7 +3,7 @@
 /**
  * Test WP_List_Util class.
  *
- * @group functions.php
+ * @group functions
  */
 class Tests_Functions_wpListUtil extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/functions/wpNonceAys.php b/tests/phpunit/tests/functions/wpNonceAys.php
index 06b807da42..02ccbd9b52 100644
--- a/tests/phpunit/tests/functions/wpNonceAys.php
+++ b/tests/phpunit/tests/functions/wpNonceAys.php
@@ -5,7 +5,8 @@
  *
  * @since 5.9.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_nonce_ays
  */
 class Tests_Functions_wpNonceAys extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpNonceField.php b/tests/phpunit/tests/functions/wpNonceField.php
index 78116f01e5..e90e693a17 100644
--- a/tests/phpunit/tests/functions/wpNonceField.php
+++ b/tests/phpunit/tests/functions/wpNonceField.php
@@ -5,7 +5,8 @@
  *
  * @since 6.1.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_nonce_field
  */
 class Tests_Functions_wpNonceField extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpNonceUrl.php b/tests/phpunit/tests/functions/wpNonceUrl.php
index f98b3a3fe8..332e5d22f2 100644
--- a/tests/phpunit/tests/functions/wpNonceUrl.php
+++ b/tests/phpunit/tests/functions/wpNonceUrl.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group functions.php
+ * @group functions
  *
  * @covers ::wp_nonce_url
  */
diff --git a/tests/phpunit/tests/functions/wpRefererField.php b/tests/phpunit/tests/functions/wpRefererField.php
index 227fee71f4..ad72bedc9c 100644
--- a/tests/phpunit/tests/functions/wpRefererField.php
+++ b/tests/phpunit/tests/functions/wpRefererField.php
@@ -5,7 +5,8 @@
  *
  * @since 6.1.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_referer_field
  */
 class Tests_Functions_wpRefererField extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpRemoteFopen.php b/tests/phpunit/tests/functions/wpRemoteFopen.php
index e29c9d3181..1e687d73d1 100644
--- a/tests/phpunit/tests/functions/wpRemoteFopen.php
+++ b/tests/phpunit/tests/functions/wpRemoteFopen.php
@@ -2,7 +2,8 @@
 /**
  * @group http
  * @group external-http
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_remote_fopen
  */
 class Tests_Functions_wpRemoteFopen extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpToKebabCase.php b/tests/phpunit/tests/functions/wpToKebabCase.php
index 7a765c78f3..c7fb5a4a7e 100644
--- a/tests/phpunit/tests/functions/wpToKebabCase.php
+++ b/tests/phpunit/tests/functions/wpToKebabCase.php
@@ -5,7 +5,8 @@
  *
  * @since 5.8.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::_wp_to_kebab_case
  */
 class Tests_Functions_wpToKebabCase extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpTriggerError.php b/tests/phpunit/tests/functions/wpTriggerError.php
index 40582bc24a..f4a62aed66 100644
--- a/tests/phpunit/tests/functions/wpTriggerError.php
+++ b/tests/phpunit/tests/functions/wpTriggerError.php
@@ -5,7 +5,8 @@
  *
  * @since 6.4.0
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_trigger_error
  */
 class Tests_Functions_WpTriggerError extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/wpValidateBoolean.php b/tests/phpunit/tests/functions/wpValidateBoolean.php
index 4cef4534ab..832e28ffc5 100644
--- a/tests/phpunit/tests/functions/wpValidateBoolean.php
+++ b/tests/phpunit/tests/functions/wpValidateBoolean.php
@@ -3,7 +3,8 @@
 /**
  * Tests for the wp_validate_boolean() function.
  *
- * @group functions.php
+ * @group functions
+ *
  * @covers ::wp_validate_boolean
  */
 class Tests_Functions_wpValidateBoolean extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/functions/xmlrpc.php b/tests/phpunit/tests/functions/xmlrpc.php
index 20164e2e4f..925801326f 100644
--- a/tests/phpunit/tests/functions/xmlrpc.php
+++ b/tests/phpunit/tests/functions/xmlrpc.php
@@ -1,7 +1,9 @@
 <?php
 
 /**
+ * @group functions
  * @group xmlrpc
+ *
  * @ticket 53490
  */
 class Tests_Functions_XMLRPC extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/load/isLogin.php b/tests/phpunit/tests/load/isLogin.php
index 84d9a26d9a..88f8700b97 100644
--- a/tests/phpunit/tests/load/isLogin.php
+++ b/tests/phpunit/tests/load/isLogin.php
@@ -3,7 +3,8 @@
 /**
  * Tests for is_login().
  *
- * @group load.php
+ * @group load
+ *
  * @covers ::is_login
  */
 class Tests_Load_IsLogin extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/load/wpConvertHrToBytes.php b/tests/phpunit/tests/load/wpConvertHrToBytes.php
index 66f4d4329b..62b3fb05e1 100644
--- a/tests/phpunit/tests/load/wpConvertHrToBytes.php
+++ b/tests/phpunit/tests/load/wpConvertHrToBytes.php
@@ -3,7 +3,7 @@
 /**
  * Tests for wp_convert_hr_to_bytes().
  *
- * @group load.php
+ * @group load
  *
  * @covers ::wp_convert_hr_to_bytes
  */
diff --git a/tests/phpunit/tests/load/wpDebugMode.php b/tests/phpunit/tests/load/wpDebugMode.php
index f873ad9069..a63f161369 100644
--- a/tests/phpunit/tests/load/wpDebugMode.php
+++ b/tests/phpunit/tests/load/wpDebugMode.php
@@ -7,8 +7,9 @@
  * @subpackage UnitTests
  * @since 5.9.0
  *
- * @group load.php
+ * @group load
  * @group wp-debug-mode
+ *
  * @covers ::wp_debug_mode
  */
 class Test_WP_Debug_Mode extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/load/wpGetDevelopmentMode.php b/tests/phpunit/tests/load/wpGetDevelopmentMode.php
index 430c6b4948..ad5ef32176 100644
--- a/tests/phpunit/tests/load/wpGetDevelopmentMode.php
+++ b/tests/phpunit/tests/load/wpGetDevelopmentMode.php
@@ -6,7 +6,8 @@
  * @subpackage UnitTests
  * @since 6.3.0
  *
- * @group load.php
+ * @group load
+ *
  * @covers ::wp_get_development_mode
  * @covers ::wp_is_development_mode
  */
diff --git a/tests/phpunit/tests/load/wpIsIniValueChangeable.php b/tests/phpunit/tests/load/wpIsIniValueChangeable.php
index 6b73bb9e5f..0f7779dc7d 100644
--- a/tests/phpunit/tests/load/wpIsIniValueChangeable.php
+++ b/tests/phpunit/tests/load/wpIsIniValueChangeable.php
@@ -3,7 +3,7 @@
 /**
  * Tests for wp_is_ini_value_changeable().
  *
- * @group load.php
+ * @group load
  *
  * @covers ::wp_is_ini_value_changeable
  */
diff --git a/tests/phpunit/tests/term.php b/tests/phpunit/tests/term.php
index 2c1e58d2ec..a9b97c1f36 100644
--- a/tests/phpunit/tests/term.php
+++ b/tests/phpunit/tests/term.php
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category
  */
 class Tests_Term extends WP_UnitTestCase {
 	protected $taxonomy        = 'category';
@@ -127,9 +128,6 @@ class Tests_Term extends WP_UnitTestCase {
 		}
 	}
 
-	/**
-	 * @group category.php
-	 */
 	public function test_term_is_ancestor_of() {
 		$term  = rand_str();
 		$term2 = rand_str();
diff --git a/tests/phpunit/tests/vars.php b/tests/phpunit/tests/vars.php
index 698f61a0e9..bb5a89c77f 100644
--- a/tests/phpunit/tests/vars.php
+++ b/tests/phpunit/tests/vars.php
@@ -2,7 +2,7 @@
 /**
  * Test functions in wp-includes/vars.php
  *
- * @group vars.php
+ * @group vars
  */
 class Tests_Vars extends WP_UnitTestCase {