diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyCrudTest.php
similarity index 98%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyCrudTest.php
index ae757f34b5be061d532e9fdb72f501d8ac75b7e1..2bb922c1b808a3e4c4c21d086d3f2bd879316899 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyCrudTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\VocabularyUnitTest.
+ * Contains \Drupal\taxonomy\Tests\VocabularyCrudTest.
  */
 
 namespace Drupal\taxonomy\Tests;
@@ -10,7 +10,7 @@
 /**
  * Tests for taxonomy vocabulary functions.
  */
-class VocabularyUnitTest extends TaxonomyTestBase {
+class VocabularyCrudTest extends TaxonomyTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUITest.php
similarity index 98%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUITest.php
index de7338f6e8e9aadee63a33ef591bd64d59a65959..112a59728665b40de3d77c18f83a113c3c71f440 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\VocabularyTest.
+ * Contains \Drupal\taxonomy\Tests\VocabularyUiTest.
  */
 
 namespace Drupal\taxonomy\Tests;
@@ -10,7 +10,7 @@
 /**
  * Tests the taxonomy vocabulary interface.
  */
-class VocabularyTest extends TaxonomyTestBase {
+class VocabularyUiTest extends TaxonomyTestBase {
 
   public static function getInfo() {
     return array(