diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
index f0a4828..de9063b 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml
@@ -6,7 +6,7 @@ source:
     - locale_cache_strings
     - locale_js_directory
 process:
-  cache_string: locale_cache_strings
+  cache_strings: locale_cache_strings
   'javascript.directory': locale_js_directory
 destination:
   plugin: config
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
index 5b34a2e..924c166 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml
@@ -11,7 +11,7 @@ process:
   'fetch.max_attempts': update_max_fetch_attempts
   'fetch.url': update_fetch_url
   'notification.threshold': update_notification_threshold
-  'notification.mails': update_notify_emails
+  'notification.emails': update_notify_emails
 destination:
   plugin: config
   config_name: update.settings
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index 592992e..c222fb3 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -39,6 +39,7 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'options',
     'search',
     'simpletest',
+    'statistics',
     'syslog',
     'taxonomy',
     'telephone',
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
index a7aab0c..ad2bcf3 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
@@ -55,7 +55,7 @@ public function setUp() {
    */
   public function testLocaleSettings() {
     $config = \Drupal::config('locale.settings');
-    $this->assertIdentical($config->get('cache_string'), 1);
+    $this->assertIdentical($config->get('cache_strings'), TRUE);
     $this->assertIdentical($config->get('javascript.directory'), 'languages');
   }
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
index 754d073..9131641 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
@@ -58,7 +58,7 @@ public function testUpdateSettings() {
     $this->assertIdentical($config->get('fetch.max_attempts'), 2);
     $this->assertIdentical($config->get('fetch.url'), 'http://updates.drupal.org/release-history');
     $this->assertIdentical($config->get('notification.threshold'), 'all');
-    $this->assertIdentical($config->get('notification.mails'), array());
+    $this->assertIdentical($config->get('notification.emails'), array());
   }
 
   /**