diff --git a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
index 02f3db5..a221eb1 100644
--- a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
@@ -7,11 +7,8 @@
 
 namespace Drupal\Tests\Core\Language;
 
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -101,25 +98,11 @@ public function testGetNegotiationMethodId() {
    * @dataProvider providerTestSortArrayOfLanguages
    *
    * @param \Drupal\Core\Language\LanguageInterface[] $languages
-   *   An array of language objects: a mix of \Drupal\Core\Language\Language and
-   *   \Drupal\language\Entity\ConfigurableLanguage.
+   *   An array of language objects.
    * @param array $expected
    *   The expected array of keys.
    */
   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' => 'rainbow', 'entity_keys' => array('id' => 'id', 'label' => 'label')));
-    $entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
-    $entityManager->expects($this->any())
-      ->method('getDefinition')
-      ->with('configurable_language')
-      ->will($this->returnValue($entityType));
-    $container = new ContainerBuilder();
-    $container->set('entity.manager', $entityManager);
-    \Drupal::setContainer($container);
-
     Language::sort($languages);
     $this->assertSame($expected, array_keys($languages));
   }
@@ -143,26 +126,16 @@ public function providerTestSortArrayOfLanguages() {
     $language10B->setName('B');
     $language10B->setWeight(10);
 
-    $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.
       array(
         // Set the data.
         array(
-          $language8A->getId() => $language8A,
           $language9A->getId() => $language9A,
           $language10B->getId() => $language10B,
         ),
         // Set the expected key order.
         array(
-          $language8A->getId(),
           $language9A->getId(),
           $language10B->getId(),
         ),
@@ -171,11 +144,9 @@ public function providerTestSortArrayOfLanguages() {
       array(
         array(
           $language10B->getId() => $language10B,
-          $language10C->getId() => $language8A,
           $language9A->getId() => $language9A,
         ),
         array(
-          $language8A->getId(),
           $language9A->getId(),
           $language10B->getId(),
         ),
@@ -185,25 +156,21 @@ public function providerTestSortArrayOfLanguages() {
         array(
           $language10A->getId() => $language10A,
           $language10B->getId() => $language10B,
-          $language10C->getId() => $language10C,
         ),
         array(
           $language10A->getId(),
           $language10B->getId(),
-          $language10C->getId(),
         ),
       ),
       // Set up data set #3, tied by weight, out of order by name.
       array(
         array(
           $language10B->getId() => $language10B,
-          $language10C->getId() => $language10C,
           $language10A->getId() => $language10A,
         ),
         array(
           $language10A->getId(),
           $language10B->getId(),
-          $language10C->getId(),
         ),
       ),
     );