diff --git a/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php b/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
index dafe4922816d941fcc825142aedf79ae5f0c6f1a..d121d735cfbf13ff42707749023009bd815577db 100644
--- a/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
@@ -326,7 +326,7 @@ public function testModuleUninstalledMenuLinks() {
   /**
    * Tests handling of pending revisions.
    *
-   * @coversDefaultClass \Drupal\menu_link_content\Plugin\Validation\Constraint\MenuTreeHierarchyConstraintValidator
+   * @covers \Drupal\menu_link_content\Plugin\Validation\Constraint\MenuTreeHierarchyConstraintValidator::validate
    */
   public function testPendingRevisions() {
     /** @var \Drupal\Core\Entity\RevisionableStorageInterface $storage */
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
index faf06d8b7ebde5db52fd228adbeb321b0e79583b..b0d1c4d90f367d3b0ac8b0f5fbfbfb73477da684 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
@@ -112,7 +112,7 @@ public function testPublishWorkspaceAccess() {
   }
 
   /**
-   * @coversDefaultClass \Drupal\workspaces\Plugin\EntityReferenceSelection\WorkspaceSelection
+   * @covers \Drupal\workspaces\Plugin\EntityReferenceSelection\WorkspaceSelection::getReferenceableEntities
    */
   public function testWorkspaceSelection() {
     $own_permission_user = $this->createUser(['view own workspace']);
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 6ad81f0594f512f1e8bfd75ba4eeff5af453c67a..d83b67c6b683526d80369fcab5bb0d21f85b3245 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -1465,11 +1465,6 @@ parameters:
 			count: 1
 			path: modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
 
-		-
-			message: "#^@coversDefaultClass defined on class method testPendingRevisions\\.$#"
-			count: 1
-			path: modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
-
 		-
 			message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
 			count: 2
@@ -2640,11 +2635,6 @@ parameters:
 			count: 1
 			path: modules/workspaces/src/WorkspacePublisher.php
 
-		-
-			message: "#^@coversDefaultClass defined on class method testWorkspaceSelection\\.$#"
-			count: 1
-			path: modules/workspaces/tests/src/Kernel/WorkspaceAccessTest.php
-
 		-
 			message: "#^Variable \\$keyed_content might not be defined\\.$#"
 			count: 1
@@ -2840,11 +2830,6 @@ parameters:
 			count: 1
 			path: tests/Drupal/Tests/Component/Plugin/Factory/ReflectionFactoryTest.php
 
-		-
-			message: "#^@coversDefaultClass defined on class method testHtmlClass\\.$#"
-			count: 1
-			path: tests/Drupal/Tests/Component/Utility/HtmlTest.php
-
 		-
 			message: "#^Result of static method Drupal\\\\Composer\\\\Composer\\:\\:ensureComposerVersion\\(\\) \\(void\\) is used\\.$#"
 			count: 1
diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index 4dc8eea2137c4edb847a6f6e11570e21587abba7..9cf07f1eaff1f1edb3483c44e414a8723a1dfa10 100644
--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -90,7 +90,7 @@ public function providerTestCleanCssIdentifier() {
   /**
    * Tests that Html::getClass() cleans the class name properly.
    *
-   * @coversDefaultClass ::getClass
+   * @covers ::getClass
    */
   public function testHtmlClass() {
     // Verify Drupal coding standards are enforced.