diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_language.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_language.yml
index 4c927f9..cd6f8d2 100644
--- a/core/modules/migrate_drupal/config/migrate.migration.d6_language.yml
+++ b/core/modules/migrate_drupal/config/migrate.migration.d6_language.yml
@@ -1,15 +1,6 @@
 id: d6_language
-sourceIds:
-  language:
-    type: varchar
-    length: 12
-    "not null": true
-destinationIds:
-  id:
-    type: varchar
-    length: 255
 source:
-  plugin: drupal6_language
+  plugin: d6_language
 process:
   id: language
   label: name
@@ -20,5 +11,4 @@ process:
     default_value: false
   status: enabled
 destination:
-  plugin: entity
-  entity_type: language_entity
+  plugin: entity:language_entity
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Language.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Language.php
index 85e0e0a..4a875ee 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Language.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/source/d6/Language.php
@@ -7,12 +7,16 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+
 /**
  * Drupal 6 language source from database.
  *
- * @PluginId("drupal6_language")
+ * @MigrateSource(
+ *   id="d6_language"
+ * )
  */
-class Language extends Drupal6SqlBase {
+class Language extends DrupalSqlBase {
 
   /**
    * {@inheritdoc}
@@ -48,6 +52,14 @@ public function fields() {
   /**
    * {@inheritdoc}
    */
+  public function getIds() {
+    $ids['language']['type'] = 'string';
+    return $ids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function checkRequirements() {
     return $this->moduleExists('locale');
   }
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6Language.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6Language.php
index 6221dd0..ba856bd 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6Language.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6Language.php
@@ -5,18 +5,17 @@
  */
 
 namespace Drupal\migrate_drupal\Tests\Dump;
-use Drupal\Core\Database\Connection;
 
 /**
  * Database dump for testing language migration.
  */
-class Drupal6Language {
+class Drupal6Language extends Drupal6DumpBase {
 
   /**
-   * @param \Drupal\Core\Database\Connection $database
+   * {@inheritdoc}
    */
-  public static function load(Connection $database) {
-    $database->schema()->createTable('languages', array(
+  public function load() {
+    $this->createTable('languages', array(
       'fields' => array(
         'language' => array(
           'type' => 'varchar',
@@ -93,7 +92,7 @@ public static function load(Connection $database) {
       'module' => 'locale',
       'name' => 'languages',
     ));
-    $database->insert('languages')->fields(array(
+    $this->database->insert('languages')->fields(array(
       'language',
       'name',
       'native',
@@ -133,5 +132,7 @@ public static function load(Connection $database) {
         'javascript' => '51e92dcfe1491f4595b9df7f3b287753',
       ))
       ->execute();
+
+    $this->setModuleVersion('locale', '6001');
   }
-}
\ No newline at end of file
+}
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateLanguageTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateLanguageTest.php
index af38f59..c60df70 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateLanguageTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateLanguageTest.php
@@ -27,7 +27,11 @@ public static function getInfo() {
     );
   }
 
-  function testLanguage() {
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
     /** @var \Drupal\migrate\entity\Migration $migration */
     $migration = entity_load('migration', 'd6_language');
     $dumps = array(
@@ -38,15 +42,17 @@ function testLanguage() {
     $executable->import();
 
     drupal_static_reset('language_list');
+  }
 
-    $language_en = language_load('en');
+  function testLanguage() {
+    $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->locked, FALSE);
     $this->assertEqual($language_en->weight, 0);
 
-    $language_fr = language_load('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);