diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_language.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_language.yml
index cd6f8d2..839633d 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_language.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_language.yml
@@ -1,4 +1,8 @@
 id: d6_language
+label: Drupal 6 languages
+migration_groups:
+  - Drupal 6
+  - Drupal 6 Multilingual
 source:
   plugin: d6_language
 process:
@@ -11,4 +15,4 @@ process:
     default_value: false
   status: enabled
 destination:
-  plugin: entity:language_entity
+  plugin: entity:configurable_language
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Language.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Language.php
index e34e60a1..46f612f 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Language.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Language.php
@@ -33,6 +33,13 @@ public function query() {
   /**
    * {@inheritdoc}
    */
+  public function count() {
+    return count($this->runQuery());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function runQuery() {
     $languages = array();
     $iterator = parent::runQuery();
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateLanguageTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateLanguageTest.php
index 78f55c2..05ef3ce 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateLanguageTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateLanguageTest.php
@@ -8,24 +8,19 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageInterface;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessage;
 use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
 
+/**
+ * Upgrade languages to language.entity.*.yml.
+ *
+ * @group migrate_drupal
+ */
 class MigrateLanguageTest extends MigrateDrupalTestBase {
 
-  public static $modules = array('language', 'migrate_drupal');
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getInfo() {
-    return array(
-      'name'  => 'Migrate languages to language.entity.*.yml',
-      'description'  => 'Upgrade languages to language.entity.*.yml',
-      'group' => 'Migrate Drupal',
-    );
-  }
+  public static $modules = array('language');
 
   /**
    * {@inheritdoc}
@@ -35,35 +30,41 @@ public function setUp() {
     /** @var \Drupal\migrate\entity\Migration $migration */
     $migration = entity_load('migration', 'd6_language');
     $dumps = array(
-      drupal_get_path('module', 'migrate_drupal') . '/src/Tests/Dump/Drupal6Language.php',
+      $this->getDumpDirectory() . '/Drupal6Language.php',
     );
     $this->prepare($migration, $dumps);
     $executable = new MigrateExecutable($migration, $this);
     $executable->import();
   }
 
+  /**
+   * Tests the Drupal 6 languages to Drupal 8 migration.
+   */
   function testLanguage() {
+    /** @var \Drupal\Core\Language\LanguageInterface $language_es */
     $language_es = \Drupal::languageManager()->getLanguage('es');
-    $this->assertEqual($language_es->id, 'es');
-    $this->assertEqual($language_es->name, 'Spanish');
-    $this->assertEqual($language_es->direction, Language::DIRECTION_LTR);
+    $this->assertEqual($language_es->getId(), 'es');
+    $this->assertEqual($language_es->getName(), 'Spanish');
+    $this->assertEqual($language_es->getDirection(), Language::DIRECTION_LTR);
     $this->assertEqual($language_es->locked, FALSE);
-    $this->assertEqual($language_es->weight, 0);
+    $this->assertEqual($language_es->getWeight(), 0);
 
+    /** @var \Drupal\Core\Language\LanguageInterface $language_fr */
     $language_fr = \Drupal::languageManager()->getLanguage('fr');
-    $this->assertEqual($language_fr->id, 'fr');
-    $this->assertEqual($language_fr->name, 'French');
-    $this->assertEqual($language_fr->direction, Language::DIRECTION_LTR);
+    $this->assertEqual($language_fr->getId(), 'fr');
+    $this->assertEqual($language_fr->getName(), 'French');
+    $this->assertEqual($language_fr->getDirection(), Language::DIRECTION_LTR);
     $this->assertEqual($language_fr->locked, FALSE);
-    $this->assertEqual($language_fr->weight, -3);
+    $this->assertEqual($language_fr->getWeight(), -3);
 
     // Ensure that English is there even if was not in the language list.
+    /** @var \Drupal\Core\Language\LanguageInterface $language_en */
     $language_en = \Drupal::languageManager()->getLanguage('en');
-    $this->assertEqual($language_en->id, 'en');
-    $this->assertEqual($language_en->name, 'English');
-    $this->assertEqual($language_en->direction, Language::DIRECTION_LTR);
+    $this->assertEqual($language_en->getId(), 'en');
+    $this->assertEqual($language_en->getName(), 'English');
+    $this->assertEqual($language_en->getDirection(), Language::DIRECTION_LTR);
     $this->assertEqual($language_en->locked, FALSE);
-    $this->assertEqual($language_en->weight, 100);
+    $this->assertEqual($language_en->getWeight(), 100);
   }
 
 }
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/LanguageSourceTest.php b/core/modules/migrate_drupal/tests/src/source/d6/LanguageSourceTest.php
index d0ee581..07778cb 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/LanguageSourceTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/LanguageSourceTest.php
@@ -13,7 +13,6 @@
  * Tests language migration from D6 to D8.
  *
  * @group migrate_drupal
- * @group Drupal
  */
 class LanguageSourceTest extends MigrateSqlSourceTestCase {
 
@@ -32,19 +31,6 @@ class LanguageSourceTest extends MigrateSqlSourceTestCase {
     'source' => array(
       'plugin' => 'drupal6_language',
     ),
-    'sourceIds' => array(
-      'language' => array(
-        // This is where the field schema would go but for now we need to
-        // specify the table alias for the key. Most likely this will be the
-        // same as BASE_ALIAS.
-        'alias' => 'l',
-      ),
-    ),
-    'destinationIds' => array(
-      'id' => array(
-        // This is where the field schema would go.
-      ),
-    ),
   );
 
   protected $expectedResults = array(
@@ -118,16 +104,6 @@ class LanguageSourceTest extends MigrateSqlSourceTestCase {
       ),
     ));
 
-  /**
-   * {@inheritdoc}
-   */
-  public static function getInfo() {
-    return array(
-      'name' => 'D6 language source functionality',
-      'description' => 'Tests D6 language source plugin.',
-      'group' => 'Migrate Drupal',
-    );
-  }
 }