diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
--- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -30,7 +30,7 @@
    * @var array[]
    */
   protected $moduleUpgradePaths = [
-    'd6_action_settings' => [
+    'action_settings' => [
       'source_module' => 'system',
       'destination_module' => 'action',
     ],
@@ -210,7 +210,7 @@
       'source_module' => 'system',
       'destination_module' => 'file',
     ],
-    'd6_file_settings' => [
+    'file_settings' => [
       'source_module' => 'system',
       'destination_module' => 'file',
     ],
@@ -406,19 +406,19 @@
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd6_system_image' => [
+    'system_image' => [
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd6_system_image_gd' => [
+    'system_image_gd' => [
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd6_system_logging' => [
+    'system_logging' => [
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd6_system_maintenance' => [
+    'system_maintenance' => [
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
@@ -426,7 +426,7 @@
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd6_system_rss' => [
+    'system_rss' => [
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
@@ -434,14 +434,6 @@
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd7_action_settings' => [
-      'source_module' => 'system',
-      'destination_module' => 'system',
-    ],
-    'd7_file_settings' => [
-      'source_module' => 'system',
-      'destination_module' => 'system',
-    ],
     'd7_system_authorize' => [
       'source_module' => 'system',
       'destination_module' => 'system',
@@ -458,34 +450,14 @@
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd7_system_image_gd' => [
-      'source_module' => 'system',
-      'destination_module' => 'system',
-    ],
-    'd7_system_image' => [
-      'source_module' => 'system',
-      'destination_module' => 'system',
-    ],
-    'd7_system_logging' => [
-      'source_module' => 'system',
-      'destination_module' => 'system',
-    ],
     'd7_system_mail' => [
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd7_system_maintenance' => [
-      'source_module' => 'system',
-      'destination_module' => 'system',
-    ],
     'd7_system_performance' => [
       'source_module' => 'system',
       'destination_module' => 'system',
     ],
-    'd7_system_rss' => [
-      'source_module' => 'system',
-      'destination_module' => 'system',
-    ],
     'd7_system_site' => [
       'source_module' => 'system',
       'destination_module' => 'system',
reverted:
--- b/core/modules/system/migration_templates/d7_action_settings.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_action_settings
-label: Drupal 7 action configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - actions_max_stack
-process:
-  recursion_limit: actions_max_stack
-destination:
-  plugin: config
-  config_name: action.settings
reverted:
--- b/core/modules/system/migration_templates/d7_file_settings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: d7_file_settings
-label: Drupal 7 file configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - file_description_type
-    - file_description_length
-    - file_icon_directory
-process:
-  'description/type': file_description_type
-  'description/length': file_description_length
-  'icon/directory': file_icon_directory
-destination:
-  plugin: config
-  config_name: file.settings
reverted:
--- b/core/modules/system/migration_templates/d7_system_image.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_system_image
-label: Drupal 7 image toolkit configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - image_toolkit
-process:
-  toolkit: image_toolkit
-destination:
-  plugin: config
-  config_name: system.image
reverted:
--- b/core/modules/system/migration_templates/d7_system_image_gd.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_system_image_gd
-label: Drupal 7 image quality configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - image_jpeg_quality
-process:
-  jpeg_quality: image_jpeg_quality
-destination:
-  plugin: config
-  config_name: system.image.gd
reverted:
--- b/core/modules/system/migration_templates/d7_system_logging.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: d7_system_logging
-label: Drupal 7 system logging
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - error_level
-process:
-  error_level:
-    plugin: static_map
-    source: error_level
-    default_value: all
-    map:
-      0: hide
-      1: some
-      2: all
-      3: verbose
-destination:
-  plugin: config
-  config_name: system.logging
reverted:
--- b/core/modules/system/migration_templates/d7_system_maintenance.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_system_maintenance
-label: Drupal 7 maintainence page configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - site_offline_message
-process:
-  message: site_offline_message
-destination:
-  plugin: config
-  config_name: system.maintenance
reverted:
--- b/core/modules/system/migration_templates/d7_system_rss.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-id: d7_system_rss
-label: Drupal 7 RSS configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - feed_default_items
-    - feed_item_length
-process:
-  'items/limit': feed_default_items
-  'items/view_mode': feed_item_length
-destination:
-  plugin: config
-  config_name: system.rss
diff -u b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
--- b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
@@ -14,18 +14,6 @@
   static $modules = ['action', 'file', 'system'];
 
   protected $expectedConfig = [
-    'action.settings' => [
-      'recursion_limit' => 28,
-    ],
-    'file.settings' => [
-      'description' => [
-        'type' => 'textfield',
-        'length' => 256,
-      ],
-      'icon' => [
-        'directory' => 'sites/default/files/icons',
-      ],
-    ],
     'system.authorize' => [
       'filetransfer_default' => 'ftp',
     ],
@@ -146,19 +134,17 @@
     parent::setUp();
 
     $migrations = [
-      'd7_action_settings',
-      'd7_file_settings',
       'd7_system_authorize',
       'd7_system_cron',
       'd7_system_date',
       'd7_system_file',
-      'd7_system_image_gd',
-      'd7_system_image',
-      'd7_system_logging',
+      'system_image_gd',
+      'system_image',
+      'system_logging',
       'd7_system_mail',
-      'd7_system_maintenance',
+      'system_maintenance',
       'd7_system_performance',
-      'd7_system_rss',
+      'system_rss',
       'd7_system_site',
     ];
     $this->executeMigrations($migrations);
only in patch2:
unchanged:
--- a/core/modules/action/migration_templates/d6_action_settings.yml
+++ b/core/modules/action/migration_templates/action_settings.yml
@@ -1,7 +1,8 @@
-id: d6_action_settings
+id: action_settings
 label: Action configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
only in patch2:
unchanged:
--- a/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
+++ b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
@@ -24,7 +24,7 @@ class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_action_settings');
+    $this->executeMigration('action_settings');
   }
 
   /**
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\Tests\action\Kernel\Migrate\d7;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to action.settings.yml.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateActionConfigsTest extends MigrateDrupal7TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['action'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('action_settings');
+  }
+
+  /**
+   * Tests migration of action variables to action.settings.yml.
+   */
+  public function testActionSettings() {
+    $config = $this->config('action.settings');
+    $this->assertIdentical(28, $config->get('recursion_limit'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config->get());
+  }
+
+}
only in patch2:
unchanged:
--- a/core/modules/file/migration_templates/d6_file_settings.yml
+++ b/core/modules/file/migration_templates/file_settings.yml
@@ -1,7 +1,8 @@
-id: d6_file_settings
+id: file_settings
 label: File configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
only in patch2:
unchanged:
--- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
@@ -19,7 +19,7 @@ class MigrateFileConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_file_settings');
+    $this->executeMigration('file_settings');
   }
 
   /**
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileConfigsTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\Tests\file\Kernel\Migrate\d7;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to file.settings.yml.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateFileConfigsTest extends MigrateDrupal7TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('file_settings');
+  }
+
+  /**
+   * Tests migration of file variables to file.settings.yml.
+   */
+  public function testFileSettings() {
+    $config = $this->config('file.settings');
+    $this->assertIdentical('textfield', $config->get('description.type'));
+    $this->assertIdentical(256, $config->get('description.length'));
+    $this->assertIdentical('sites/default/files/icons', $config->get('icon.directory'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'file.settings', $config->get());
+  }
+
+}
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
@@ -131,7 +131,6 @@ protected function testMigrateUpgrade() {
     // nice warning.
     $this->drupalPostForm(NULL, [$driver . '[database]' => 'wrong'] + $edits, t('Review upgrade'));
     $this->assertText('Resolve the issue below to continue the upgrade.');
-
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $this->assertResponse(200);
     $this->assertText('Are you sure?');
only in patch2:
unchanged:
--- a/core/modules/system/migration_templates/d6_system_image.yml
+++ b/core/modules/system/migration_templates/system_image.yml
@@ -1,7 +1,8 @@
-id: d6_system_image
+id: system_image
 label: Image toolkit configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
only in patch2:
unchanged:
--- a/core/modules/system/migration_templates/d6_system_image_gd.yml
+++ b/core/modules/system/migration_templates/system_image_gd.yml
@@ -1,7 +1,8 @@
-id: d6_system_image_gd
+id: system_image_gd
 label: Image quality configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
only in patch2:
unchanged:
--- a/core/modules/system/migration_templates/d6_system_logging.yml
+++ b/core/modules/system/migration_templates/system_logging.yml
@@ -1,7 +1,8 @@
-id: d6_system_logging
+id: system_logging
 label: System logging
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
only in patch2:
unchanged:
--- a/core/modules/system/migration_templates/d6_system_maintenance.yml
+++ b/core/modules/system/migration_templates/system_maintenance.yml
@@ -1,7 +1,8 @@
-id: d6_system_maintenance
+id: system_maintenance
 label: Maintenance page configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
only in patch2:
unchanged:
--- a/core/modules/system/migration_templates/d6_system_rss.yml
+++ b/core/modules/system/migration_templates/system_rss.yml
@@ -1,7 +1,8 @@
-id: d6_system_rss
+id: system_rss
 label: RSS configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
only in patch2:
unchanged:
--- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
@@ -16,7 +16,7 @@ class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_system_image_gd');
+    $this->executeMigration('system_image_gd');
   }
 
   /**
only in patch2:
unchanged:
--- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
@@ -16,7 +16,7 @@ class MigrateSystemImageTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_system_image');
+    $this->executeMigration('system_image');
   }
 
   /**
only in patch2:
unchanged:
--- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
@@ -19,7 +19,7 @@ class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_system_logging');
+    $this->executeMigration('system_logging');
   }
 
   /**
only in patch2:
unchanged:
--- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
@@ -16,7 +16,7 @@ class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_system_maintenance');
+    $this->executeMigration('system_maintenance');
   }
 
   /**
only in patch2:
unchanged:
--- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
@@ -16,7 +16,7 @@ class MigrateSystemRssTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d6_system_rss');
+    $this->executeMigration('system_rss');
   }
 
   /**