diff --git a/core/tests/Drupal/Tests/Core/Utility/TokenUnitTest.php b/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
similarity index 94%
rename from core/tests/Drupal/Tests/Core/Utility/TokenUnitTest.php
rename to core/tests/Drupal/Tests/Core/Utility/TokenTest.php
index f2d0a2d8e1b53111e370dc77fa1bbdef020a826f..f92502ea446bc4a04950d83a8e170985f0913088 100644
--- a/core/tests/Drupal/Tests/Core/Utility/TokenUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Utility\TokenUnitTest.
+ * Contains \Drupal\Tests\Core\Utility\TokenTest.
  */
 
 namespace Drupal\Tests\Core\Utility;
@@ -12,9 +12,9 @@
 use Drupal\Tests\UnitTestCase;
 
 /**
- * @coversDefaultClass \Drupal\Tests\Core\Utility\Token
+ * @coversDefaultClass \Drupal\Core\Utility\Token
  */
-class TokenUnitTest extends UnitTestCase {
+class TokenTest extends UnitTestCase {
 
   /**
    * The cache used for testing.
@@ -71,7 +71,7 @@ public function setUp() {
   }
 
   /**
-   * @covers getInfo
+   * @covers ::getInfo
    */
   public function testGetInfo() {
     $token_info = array(