diff --git a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
index 2dca459..27b4df3 100644
--- a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
@@ -109,7 +109,7 @@ public function testSortArrayOfLanguages(array $languages, array $expected) {
     // Can not mock the entity type because accessing a mock entity type during
     // the sort will cause the "uasort(): Array was modified by the user
     // comparison function" PHP error.
-    $entityType = new EntityType(array('id' => 'configurable_language', 'entity_keys' => array('id' => 'id', 'label' => 'label')));
+    $entityType = new EntityType(array('id' => 'rainbow', 'entity_keys' => array('id' => 'id', 'label' => 'label')));
     $entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
     $entityManager->expects($this->any())
       ->method('getDefinition')
@@ -142,8 +142,13 @@ public function providerTestSortArrayOfLanguages() {
     $language10B->setName('B');
     $language10B->setWeight(10);
 
-    $language8A = new ConfigurableLanguage(array('id' => 'hh', 'label' => 'A', 'weight' => 8), 'configurable_language');
-    $language10C = new ConfigurableLanguage(array('id' => 'gg', 'label' => 'C', 'weight' => 10), 'configurable_language');
+    $language8A = new ConfigurableLanguage(array('id' => 'hh'), 'configurable_language');
+    $language8A->setName('A');
+    $language8A->setWeight(8);
+
+    $language10C = new ConfigurableLanguage(array('id' => 'hh'), 'configurable_language');
+    $language10C->setName('C');
+    $language10C->setWeight(10);
 
     return array(
       // Set up data set #0, already ordered by weight.
@@ -165,13 +170,13 @@ public function providerTestSortArrayOfLanguages() {
       array(
         array(
           $language10B->getId() => $language10B,
-          $language10C->getId() => $language10C,
+          $language10C->getId() => $language8A,
           $language9A->getId() => $language9A,
         ),
         array(
+          $language8A->getId(),
           $language9A->getId(),
           $language10B->getId(),
-          $language10C->getId(),
         ),
       ),
       // Set up data set #2, tied by weight, already ordered by name.
@@ -191,11 +196,13 @@ public function providerTestSortArrayOfLanguages() {
       array(
         array(
           $language10B->getId() => $language10B,
+          $language10C->getId() => $language10C,
           $language10A->getId() => $language10A,
         ),
         array(
           $language10A->getId(),
           $language10B->getId(),
+          $language10C->getId(),
         ),
       ),
     );