diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index 09d81cf..cf7cab4 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -41536,10 +41536,30 @@
   'value' => 'i:999;',
 ))
 ->values(array(
+  'name' => 'update_check_frequency',
+  'value' => 'i:1;',
+))
+->values(array(
+  'name' => 'update_fetch_url',
+  'value' => 's:23:"http://127.0.0.1/update";',
+))
+->values(array(
   'name' => 'update_last_check',
   'value' => 'i:1444944973;',
 ))
 ->values(array(
+  'name' => 'update_max_fetch_attempts',
+  'value' => 'i:3;',
+))
+->values(array(
+  'name' => 'update_notification_threshold',
+  'value' => 's:3:"all";',
+))
+->values(array(
+  'name' => 'update_notify_emails',
+  'value' => 'a:1:{i:0;s:19:"webmaster@127.0.0.1";}',
+))
+->values(array(
   'name' => 'user_admin_role',
   'value' => 's:1:"3";',
 ))
diff --git a/core/modules/update/migration_templates/d6_update_settings.yml b/core/modules/update/migration_templates/d6_update_settings.yml
deleted file mode 100644
index 37e0ef1..0000000
--- a/core/modules/update/migration_templates/d6_update_settings.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: d6_update_settings
-label: Update configuration
-migration_tags:
-  - Drupal 6
-source:
-  plugin: variable
-  variables:
-    - update_max_fetch_attempts
-    - update_fetch_url
-    - update_notification_threshold
-    - update_notify_emails
-    - update_check_frequency
-process:
-  'fetch/max_attempts': update_max_fetch_attempts
-  'fetch/url': update_fetch_url
-  'notification/threshold': update_notification_threshold
-  'notification/emails': update_notify_emails
-  'check/interval_days': update_check_frequency
-destination:
-  plugin: config
-  config_name: update.settings
diff --git a/core/modules/update/migration_templates/update_settings.yml b/core/modules/update/migration_templates/update_settings.yml
new file mode 100644
index 0000000..ad22472
--- /dev/null
+++ b/core/modules/update/migration_templates/update_settings.yml
@@ -0,0 +1,22 @@
+id: update_settings
+label: Update configuration
+migration_tags:
+  - Drupal 6
+  - Drupal 7
+source:
+  plugin: variable
+  variables:
+    - update_max_fetch_attempts
+    - update_fetch_url
+    - update_notification_threshold
+    - update_notify_emails
+    - update_check_frequency
+process:
+  'fetch/max_attempts': update_max_fetch_attempts
+  'fetch/url': update_fetch_url
+  'notification/threshold': update_notification_threshold
+  'notification/emails': update_notify_emails
+  'check/interval_days': update_check_frequency
+destination:
+  plugin: config
+  config_name: update.settings
diff --git a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
index 679350a..29cf502 100644
--- a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
+++ b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
@@ -29,7 +29,7 @@ class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_update_settings');
+    $this->executeMigration('update_settings');
   }
 
   /**