diff --git a/core/modules/simpletest/src/TestDiscovery.php b/core/modules/simpletest/src/TestDiscovery.php
index 4c762a7..1d4d579 100644
--- a/core/modules/simpletest/src/TestDiscovery.php
+++ b/core/modules/simpletest/src/TestDiscovery.php
@@ -160,9 +160,9 @@ public function getTestClasses($extension = NULL) {
       try {
         $info = static::getTestInfo($classname, $parser->getDocComment());
       }
-      catch (\LogicException $e) {
-        // If the class is missing a summary line or an @group annotation just
-        // skip it. Most likely it is an abstract class, trait or test fixture.
+      catch (MissingGroupException $e) {
+        // If the class is @group annotation just skip it. Most likely it is an
+        // abstract class, trait or test fixture.
         continue;
       }
       // Skip this test class if it requires unavailable modules.
diff --git a/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php b/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
index 2c15bed..6f04a65 100644
--- a/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
+++ b/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Routing\Route;
 
 /**
+ * Tests the <none> route processor.
+ *
  * @see system.routing.yml
  * @see \Drupal\Core\Routing\UrlGenerator
  * @group route_processor
diff --git a/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php b/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
index 8e8a357..9305e04 100644
--- a/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
+++ b/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Routing\Route;
 
 /**
+ * Tests the <current> route processor.
+ *
  * @see \Drupal\Core\RouteProcessor\RouteProcessorCurrent
  * @group route_processor
  */
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php
index 416bd0e..859aee6 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php
@@ -18,7 +18,7 @@
  * @coversDefaultClass \Drupal\Core\Cache\CacheContextsManager
  * @group Cache
  */
-class CacheContextsTest extends UnitTestCase {
+class CacheContextsManagerTest extends UnitTestCase {
 
   /**
    * @covers ::optimizeTokens
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php
index 95bd570..1c51138 100644
--- a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php
@@ -9,6 +9,7 @@
 
 /**
  * @group Config
+ * @coversDefaultClass \Drupal\Core\Config\ConfigFactory
  */
 class ConfigFactoryTest extends UnitTestCase {