diff --git a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php b/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
index 2ad5f5a..4abb84a 100644
--- a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
+++ b/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
@@ -13,6 +13,7 @@
 
 /**
  * Tests the Feed entity's cache tags.
+ * @group aggregator
  */
 class FeedCacheTagsTest extends EntityWithUriCacheTagsTestBase {
 
@@ -24,13 +25,6 @@ class FeedCacheTagsTest extends EntityWithUriCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static function getInfo() {
-    return parent::generateStandardizedInfo('Aggregator feed', 'Aggregator');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php b/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
index f79a53c..0327e1e 100644
--- a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
+++ b/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
@@ -14,6 +14,7 @@
 
 /**
  * Tests the Item entity's cache tags.
+ * @group aggregator
  */
 class ItemCacheTagsTest extends EntityCacheTagsTestBase {
 
@@ -25,13 +26,6 @@ class ItemCacheTagsTest extends EntityCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static function getInfo() {
-    return parent::generateStandardizedInfo('Aggregator feed item', 'Aggregator');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/core/modules/contact/src/Tests/ContactStorageTest.php b/core/modules/contact/src/Tests/ContactStorageTest.php
index 741e6b5..d1aaa18 100644
--- a/core/modules/contact/src/Tests/ContactStorageTest.php
+++ b/core/modules/contact/src/Tests/ContactStorageTest.php
@@ -12,6 +12,7 @@
 
 /**
  * Tests storing contact messages.
+ * @group contact
  */
 class ContactStorageTest extends ContactSitewideTest {
 
@@ -30,14 +31,6 @@ class ContactStorageTest extends ContactSitewideTest {
     'contact_test',
   );
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Contact Storage',
-      'description' => 'Tests that contact messages can be stored.',
-      'group' => 'Contact',
-    );
-  }
-
   /**
    * Tests configuration options and the site-wide contact form.
    */
diff --git a/core/modules/language/src/Tests/EntityDefaultLanguageTest.php b/core/modules/language/src/Tests/EntityDefaultLanguageTest.php
index 4c5f3b2..4b08cf8 100644
--- a/core/modules/language/src/Tests/EntityDefaultLanguageTest.php
+++ b/core/modules/language/src/Tests/EntityDefaultLanguageTest.php
@@ -12,6 +12,7 @@
 
 /**
  * Tests default language code is properly generated for entities.
+ * @group language
  */
 class EntityDefaultLanguageTest extends KernelTestBase {
 
@@ -25,17 +26,6 @@ class EntityDefaultLanguageTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static function getInfo() {
-    return array(
-      'name' => 'Entity default language',
-      'description' => 'Test that entities are created with correct language code.',
-      'group' => 'Entity API',
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function setUp() {
     parent::setUp();
 
diff --git a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
index e806a60..bd0bd67 100644
--- a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
+++ b/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
@@ -10,6 +10,7 @@
 
 /**
  * Tests the placement of RDFa in link field formatters.
+ * @group rdf
  */
 class LinkFieldRdfaTest extends FieldRdfaTestBase {
 
@@ -26,17 +27,6 @@ class LinkFieldRdfaTest extends FieldRdfaTestBase {
   /**
    * {@inheritdoc}
    */
-  public static function getInfo() {
-    return array(
-      'name'  => 'Field formatter: link',
-      'description'  => 'Tests RDFa output by link field formatters.',
-      'group' => 'RDF',
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
index bdf08e3..4e3daaa 100644
--- a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
+++ b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
@@ -11,6 +11,7 @@
 
 /**
  * Tests adding a custom bundle field.
+ * @group system
  */
 class EntitySchemaTest extends EntityUnitTestBase  {
 
@@ -31,17 +32,6 @@ class EntitySchemaTest extends EntityUnitTestBase  {
   /**
    * {@inheritdoc}
    */
-  public static function getInfo() {
-    return array(
-      'name' => 'Entity Schema',
-      'description' => 'Tests entity field schema API for base and bundle fields.',
-      'group' => 'Entity API',
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function setUp() {
     parent::setUp();
     $this->installSchema('user', array('users_data'));
diff --git a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
index 4548e48..947d553 100644
--- a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
+++ b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
@@ -60,17 +60,6 @@ class UserAccessControlHandlerTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public static function getInfo() {
-    return array(
-      'name' => 'User access controller',
-      'description' => 'Tests the user access controller.',
-      'group' => 'User',
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function setUp() {
     parent::setUp();
     $this->viewer = $this->getMock('\Drupal\Core\Session\AccountInterface');
diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index cd0ee1d..8b103cb 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -12,19 +12,12 @@
 
 /**
  * Tests marking strings as safe.
+ * @group Drupal
  *
  * @coversDefaultClass \Drupal\Component\Utility\SafeMarkup
  */
 class SafeMarkupTest extends UnitTestCase {
 
-  public static function getInfo() {
-    return array(
-      'name' => 'SafeMarkup tests',
-      'description' => 'Confirm that SafeMarkup methods work correctly.',
-      'group' => 'Common',
-    );
-  }
-
   /**
    * Tests SafeMarkup::set() and SafeMarkup::isSafe().
    *