Index: tests/phpunit/tests/admin/includesTheme.php
===================================================================
--- tests/phpunit/tests/admin/includesTheme.php	(revision 56497)
+++ tests/phpunit/tests/admin/includesTheme.php	(working copy)
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @group admin
  * @group themes
  */
 class Tests_Admin_IncludesTheme extends WP_UnitTestCase {
Index: tests/phpunit/tests/admin/wpAutomaticUpdater.php
===================================================================
--- tests/phpunit/tests/admin/wpAutomaticUpdater.php	(revision 56497)
+++ tests/phpunit/tests/admin/wpAutomaticUpdater.php	(working copy)
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group admin
  * @group upgrade
  *
  * @covers WP_Automatic_Updater
Index: tests/phpunit/tests/admin/wpSiteHealth.php
===================================================================
--- tests/phpunit/tests/admin/wpSiteHealth.php	(revision 56497)
+++ tests/phpunit/tests/admin/wpSiteHealth.php	(working copy)
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group admin
  * @group site-health
  *
  * @coversDefaultClass WP_Site_Health
Index: tests/phpunit/tests/admin/wpUserSearch.php
===================================================================
--- tests/phpunit/tests/admin/wpUserSearch.php	(revision 56497)
+++ tests/phpunit/tests/admin/wpUserSearch.php	(working copy)
@@ -1,5 +1,8 @@
 <?php
 /**
+ * @group admin
+ * @group user
+ *
  * @coversDefaultClass WP_User_Search
  */
 class Tests_Admin_wpUserSearch extends WP_UnitTestCase {
Index: tests/phpunit/tests/admin/wpUsersListTable.php
===================================================================
--- tests/phpunit/tests/admin/wpUsersListTable.php	(revision 56497)
+++ tests/phpunit/tests/admin/wpUsersListTable.php	(working copy)
@@ -2,6 +2,7 @@
 
 /**
  * @group admin
+ * @group user
  *
  * @covers WP_Users_List_Table
  */
Index: tests/phpunit/tests/block-supports/duotone.php
===================================================================
--- tests/phpunit/tests/block-supports/duotone.php	(revision 56497)
+++ tests/phpunit/tests/block-supports/duotone.php	(working copy)
@@ -3,6 +3,8 @@
 /**
  * Test the block WP_Duotone class.
  *
+ * @group block-supports
+ *
  * @package WordPress
  */
 
Index: tests/phpunit/tests/blocks/getBlockTemplates.php
===================================================================
--- tests/phpunit/tests/blocks/getBlockTemplates.php	(revision 56497)
+++ tests/phpunit/tests/blocks/getBlockTemplates.php	(working copy)
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @group blocks
  * @group block-templates
  *
  * @covers ::get_block_templates
Index: tests/phpunit/tests/canonical/category.php
===================================================================
--- tests/phpunit/tests/canonical/category.php	(revision 56497)
+++ tests/phpunit/tests/canonical/category.php	(working copy)
@@ -2,6 +2,8 @@
 
 /**
  * @group canonical
+ * @group rewrite
+ * @group query
  */
 class Tests_Canonical_Category extends WP_Canonical_UnitTestCase {
 	public $structure = '/%category%/%postname%/';
Index: tests/phpunit/tests/canonical/stripFragmentFromUrl.php
===================================================================
--- tests/phpunit/tests/canonical/stripFragmentFromUrl.php	(revision 56497)
+++ tests/phpunit/tests/canonical/stripFragmentFromUrl.php	(working copy)
@@ -4,6 +4,7 @@
  * @group canonical
  * @group rewrite
  * @group query
+ *
  * @covers ::strip_fragment_from_url
  */
 class Tests_Canonical_StripFragmentFromUrl extends WP_UnitTestCase {
Index: tests/phpunit/tests/category/categoryDescription.php
===================================================================
--- tests/phpunit/tests/category/categoryDescription.php	(revision 56497)
+++ tests/phpunit/tests/category/categoryDescription.php	(working copy)
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category.php
  *
  * @covers ::category_description
  */
Index: tests/phpunit/tests/category/getCategoryLink.php
===================================================================
--- tests/phpunit/tests/category/getCategoryLink.php	(revision 56497)
+++ tests/phpunit/tests/category/getCategoryLink.php	(working copy)
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category.php
  *
  * @covers ::get_category_link
  */
Index: tests/phpunit/tests/category/getCategoryParents.php
===================================================================
--- tests/phpunit/tests/category/getCategoryParents.php	(revision 56497)
+++ tests/phpunit/tests/category/getCategoryParents.php	(working copy)
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category.php
  *
  * @covers ::get_category_parents
  */
Index: tests/phpunit/tests/category/getTheCategoryById.php
===================================================================
--- tests/phpunit/tests/category/getTheCategoryById.php	(revision 56497)
+++ tests/phpunit/tests/category/getTheCategoryById.php	(working copy)
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category.php
  *
  * @covers ::get_the_category_by_ID
  */
Index: tests/phpunit/tests/category/walkerCategory.php
===================================================================
--- tests/phpunit/tests/category/walkerCategory.php	(revision 56497)
+++ tests/phpunit/tests/category/walkerCategory.php	(working copy)
@@ -1,6 +1,7 @@
 <?php
 /**
  * @group taxonomy
+ * @group category.php
  * @group walker
  *
  * @covers Walker_Category::start_el
Index: tests/phpunit/tests/category/wpListCategories.php
===================================================================
--- tests/phpunit/tests/category/wpListCategories.php	(revision 56497)
+++ tests/phpunit/tests/category/wpListCategories.php	(working copy)
@@ -2,6 +2,7 @@
 
 /**
  * @group taxonomy
+ * @group category.php
  *
  * @covers ::wp_list_categories
  */
Index: tests/phpunit/tests/comment/commentForm.php
===================================================================
--- tests/phpunit/tests/comment/commentForm.php	(revision 56497)
+++ tests/phpunit/tests/comment/commentForm.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
  *
  * @covers ::comment_form
  */
Index: tests/phpunit/tests/comment/commentsOpen.php
===================================================================
--- tests/phpunit/tests/comment/commentsOpen.php	(revision 56497)
+++ tests/phpunit/tests/comment/commentsOpen.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
  * @covers ::comments_open
  */
 class Tests_Comment_CommentsOpen extends WP_UnitTestCase {
Index: tests/phpunit/tests/comment/pingsOpen.php
===================================================================
--- tests/phpunit/tests/comment/pingsOpen.php	(revision 56497)
+++ tests/phpunit/tests/comment/pingsOpen.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
  * @covers ::pings_open
  */
 class Tests_Comment_PingsOpen extends WP_UnitTestCase {
Index: tests/phpunit/tests/comment/wpUpdateCommentCountNow.php
===================================================================
--- tests/phpunit/tests/comment/wpUpdateCommentCountNow.php	(revision 56497)
+++ tests/phpunit/tests/comment/wpUpdateCommentCountNow.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @group  comment
+ * @group comment
  *
  * @covers ::wp_update_comment_count_now
  */
Index: tests/phpunit/tests/customize/selective-refresh-ajax.php
===================================================================
--- tests/phpunit/tests/customize/selective-refresh-ajax.php	(revision 56497)
+++ tests/phpunit/tests/customize/selective-refresh-ajax.php	(working copy)
@@ -9,6 +9,7 @@
  * @subpackage UnitTests
  * @since 4.5.0
  *
+ * @group customize
  * @group ajax
  */
 class Test_WP_Customize_Selective_Refresh_Ajax extends WP_UnitTestCase {
Index: tests/phpunit/tests/date/maybeDeclineDate.php
===================================================================
--- tests/phpunit/tests/date/maybeDeclineDate.php	(revision 56497)
+++ tests/phpunit/tests/date/maybeDeclineDate.php	(working copy)
@@ -3,6 +3,7 @@
 /**
  * @group functions.php
  * @group i18n
+ * @group date
  * @group datetime
  * @covers ::wp_maybe_decline_date
  */
Index: tests/phpunit/tests/db/dbDelta.php
===================================================================
--- tests/phpunit/tests/db/dbDelta.php	(revision 56497)
+++ tests/phpunit/tests/db/dbDelta.php	(working copy)
@@ -3,6 +3,7 @@
 /**
  * Test dbDelta()
  *
+ * @group wpdb
  * @group upgrade
  * @group dbdelta
  *
Index: tests/phpunit/tests/editor/classic-to-block-menu-converter.php
===================================================================
--- tests/phpunit/tests/editor/classic-to-block-menu-converter.php	(revision 56497)
+++ tests/phpunit/tests/editor/classic-to-block-menu-converter.php	(working copy)
@@ -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 {
 
Index: tests/phpunit/tests/editor/navigation-fallback.php
===================================================================
--- tests/phpunit/tests/editor/navigation-fallback.php	(revision 56497)
+++ tests/phpunit/tests/editor/navigation-fallback.php	(working copy)
@@ -7,6 +7,8 @@
 
 /**
  * Tests for the WP_Navigation_Fallback class.
+ *
+ * @group editor
  */
 class WP_Navigation_Fallback_Test extends WP_UnitTestCase {
 
Index: tests/phpunit/tests/filesystem/copyDir.php
===================================================================
--- tests/phpunit/tests/filesystem/copyDir.php	(revision 56497)
+++ tests/phpunit/tests/filesystem/copyDir.php	(working copy)
@@ -3,6 +3,8 @@
 /**
  * Tests copy_dir().
  *
+ * @group filesystem
+ * @group wp-filesystem
  * @group file.php
  *
  * @covers ::copy_dir
Index: tests/phpunit/tests/filesystem/findFolder.php
===================================================================
--- tests/phpunit/tests/filesystem/findFolder.php	(revision 56497)
+++ tests/phpunit/tests/filesystem/findFolder.php	(working copy)
@@ -5,6 +5,7 @@
 /**
  * @group filesystem
  * @group wp-filesystem
+ * @group file.php
  */
 class WP_Filesystem_Find_Folder_Test extends WP_Filesystem_UnitTestCase {
 
@@ -93,7 +94,7 @@
 			/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/
Index: tests/phpunit/tests/filesystem/moveDir.php
===================================================================
--- tests/phpunit/tests/filesystem/moveDir.php	(revision 56497)
+++ tests/phpunit/tests/filesystem/moveDir.php	(working copy)
@@ -3,6 +3,8 @@
 /**
  * Tests move_dir().
  *
+ * @group filesystem
+ * @group wp-filesystem
  * @group file.php
  *
  * @covers ::move_dir
Index: tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php
===================================================================
--- tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php	(revision 56497)
+++ tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php	(working copy)
@@ -3,6 +3,8 @@
 /**
  * Tests wp_opcache_invalidate_directory().
  *
+ * @group filesystem
+ * @group wp-filesystem
  * @group file.php
  *
  * @covers ::wp_opcache_invalidate_directory