diff -u b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
--- b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
@@ -154,6 +154,9 @@
       'name' => 'email__active_tab',
       'value' => 's:25:"edit-email-password-reset";',
     ))->values(array(
+      'name' => 'error_level',
+      'value' => 'i:1;',
+    ))->values(array(
       'name' => 'feed_default_items',
       'value' => 'i:27;',
     ))->values(array(
@@ -184,6 +187,9 @@
       'name' => 'file_temporary_path',
       'value' => 's:4:"/tmp";',
     ))->values(array(
+      'name' => 'filter_allowed_protocols',
+      'value' => 'a:3:{i:0;s:4:"http";i:1;s:5:"https";i:2;s:3:"irc";}',
+    ))->values(array(
       'name' => 'filter_fallback_format',
       'value' => 's:10:"plain_text";',
     ))->values(array(
@@ -193,6 +199,12 @@
       'name' => 'forum_nav_vocabulary',
       'value' => 's:1:"2";',
     ))->values(array(
+      'name' => 'image_jpeg_quality',
+      'value' => 'i:80;',
+    ))->values(array(
+      'name' => 'image_toolkit',
+      'value' => 's:2:"gd";',
+    ))->values(array(
       'name' => 'install_profile',
       'value' => 's:8:"standard";',
     ))->values(array(
@@ -328,6 +340,9 @@
       'name' => 'site_name',
       'value' => 's:13:"The Site Name";',
     ))->values(array(
+      'name' => 'site_offline_message',
+      'value' => 's:42:"This is a custom maintenance mode message.";',
+    ))->values(array(
       'name' => 'site_slogan',
       'value' => 's:10:"The Slogan";',
     ))->values(array(
@@ -469 +484 @@
-#845efe7ed5e4c65f341d5dea722372ed
+#34912198fcf65ec583f1e478b1de98da
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateActionSettingsTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateActionSettingsTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates action configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_action_settings
- */
-class MigrateActionSettingsTest extends MigrateDrupal7VariableBase {
-
-  static $modules = array('action');
-
-  protected $expectedConfig = [
-    'action.settings' => [
-      'recursion_limit' => 28,
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_action_settings');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateFileSettingsTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateFileSettingsTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates action configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_file_settings
- */
-class MigrateFileSettingsTest extends MigrateDrupal7VariableBase {
-
-  static $modules = array('file');
-
-  protected $expectedConfig = [
-    'file.settings' => [
-      'description' => [
-        'type' => 'textfield',
-        'length' => 256,
-      ],
-      'icon' => [
-        'directory' => 'sites/default/files/icons',
-      ],
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_file_settings');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemAuthorizeTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemAuthorizeTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates authorize configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_system_authorize
- */
-class MigrateSystemAuthorizeTest extends MigrateDrupal7VariableBase {
-
-  protected $expectedConfig = [
-    'system.authorize' => [
-      'filetransfer_default' => 'ftp',
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_system_authorize');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemCronTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemCronTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates cron configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_system_cron
- */
-class MigrateSystemCronTest extends MigrateDrupal7VariableBase {
-
-  protected $expectedConfig = [
-    'system.cron' => [
-      'threshold' => [
-        // autorun is not handled by the migration.
-        'autorun' => 0,
-        'requirements_warning' => 172800,
-        'requirements_error' => 1209600,
-      ],
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_system_cron');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemFileTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemFileTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates file configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_system_file
- */
-class MigrateSystemFileTest extends MigrateDrupal7VariableBase {
-
-  protected $expectedConfig = [
-    'system.file' => [
-      'allow_insecure_uploads' => TRUE,
-      // default_scheme is not handled by the migration.
-      'default_scheme' => 'public',
-      'path' => [
-        'temporary' => '/tmp',
-      ],
-      // temporary_maximum_age is not handled by the migration.
-      'temporary_maximum_age' => 21600,
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_system_file');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemPerformanceTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemPerformanceTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates performance configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_system_file
- */
-class MigrateSystemPerformancetest extends MigrateDrupal7VariableBase {
-
-  protected $expectedConfig = [
-    'system.performance' => [
-      'cache' => [
-        'page' => [
-          'max_age' => 300,
-        ],
-      ],
-      'css' => [
-        'preprocess' => TRUE,
-        // gzip is not handled by the migration.
-        'gzip' => TRUE,
-      ],
-      // fast_404 is not handled by the migration.
-      'fast_404' => [
-        'enabled' => TRUE,
-        'paths' => '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i',
-        'exclude_paths' => '/\/(?:styles|imagecache)\//',
-        'html' => '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>',
-      ],
-      'js' => [
-        'preprocess' => FALSE,
-        // gzip is not handled by the migration.
-        'gzip' => TRUE,
-      ],
-      // stale_file_threshold is not handled by the migration.
-      'stale_file_threshold' => 2592000,
-      'response' => [
-        'gzip' => TRUE,
-      ],
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_system_performance');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemRSSTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemRSSTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates RSS configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_system_rss
- */
-class MigrateSystemRSSTest extends MigrateDrupal7VariableBase {
-
-  protected $expectedConfig = [
-    'system.rss' => [
-      'channel' => [
-        'description' => '',
-      ],
-      'items' => [
-        'limit' => 27,
-        'view_mode' => 'fulltext',
-      ],
-      'langcode' => 'en',
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_system_rss');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemSiteTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemSiteTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates site configuration.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_system_site
- */
-class MigrateSystemSiteTest extends MigrateDrupal7VariableBase {
-
-  protected $expectedConfig = [
-    'system.site' => [
-      // uuid is not handled by the migration.
-      'uuid' => '',
-      'name' => 'The Site Name',
-      'mail' => 'joseph@flattandsons.com',
-      'slogan' => 'The Slogan',
-      'page' => [
-        '403' => 'node',
-        '404' => 'node',
-        'front' => 'node',
-      ],
-      'admin_compact_mode' => TRUE,
-      'weight_select_max' => 40,
-      // langcode and default_langcode are not handled by the migration.
-      'langcode' => 'en',
-      'default_langcode' => 'en',
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Migrate users.
-    $migration = entity_load('migration', 'd7_system_site');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-}
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_filter.yml
@@ -0,0 +1,13 @@
+id: d7_system_filter
+label: Drupal 7 system filter configuration
+migration_tags:
+  - Drupal 7
+source:
+  plugin: variable
+  variables:
+    - filter_allowed_protocols
+process:
+  protocols: filter_allowed_protocols
+destination:
+  plugin: config
+  config_name: system.filter
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_image.yml
@@ -0,0 +1,13 @@
+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
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_image_gd.yml
@@ -0,0 +1,13 @@
+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
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_logging.yml
@@ -0,0 +1,21 @@
+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
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_maintenance.yml
@@ -0,0 +1,13 @@
+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
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemConfigurationTest.php
@@ -0,0 +1,202 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemConfigurationTest.
+ */
+
+namespace Drupal\migrate_drupal\Tests\d7;
+
+use Drupal\migrate\MigrateExecutable;
+
+/**
+ * Migrates various configuration objects owned by the System module.
+ *
+ * @group migrate_drupal 7.x
+ * @dumpFile d7/Variable.php
+ * @migration d7_action_settings
+ * @migration d7_file_settings
+ * @migration d7_system_authorize
+ * @migration d7_system_cron
+ * @migration d7_system_file
+ * @migration d7_system_filter
+ * @migration d7_system_image_gd
+ * @migration d7_system_image
+ * @migration d7_system_logging
+ * @migration d7_system_performance
+ * @migration d7_system_rss
+ * @migration d7_system_site
+ */
+class MigrateSystemConfigurationTest extends MigrateDrupal7VariableBase {
+
+  static $modules = array('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',
+    ],
+    'system.cron' => [
+      'threshold' => [
+        // autorun is not handled by the migration.
+        'autorun' => 0,
+        'requirements_warning' => 172800,
+        'requirements_error' => 1209600,
+      ],
+    ],
+    'system.file' => [
+      'allow_insecure_uploads' => TRUE,
+      // default_scheme is not handled by the migration.
+      'default_scheme' => 'public',
+      'path' => [
+        'temporary' => '/tmp',
+      ],
+      // temporary_maximum_age is not handled by the migration.
+      'temporary_maximum_age' => 21600,
+    ],
+    'system.filter' => [
+      'protocols' => ['http', 'https', 'irc'],
+    ],
+    'system.image.gd' => [
+      'jpeg_quality' => 80,
+    ],
+    'system.image' => [
+      'toolkit' => 'gd',
+    ],
+    'system.logging' => [
+      'error_level' => 'some',
+    ],
+    'system.maintenance' => [
+      'message' => 'This is a custom maintenance mode message.',
+      // langcode is not handled by the migration.
+      'langcode' => 'en',
+    ],
+    'system.performance' => [
+      'cache' => [
+        'page' => [
+          'max_age' => 300,
+        ],
+      ],
+      'css' => [
+        'preprocess' => TRUE,
+        // gzip is not handled by the migration.
+        'gzip' => TRUE,
+      ],
+      // fast_404 is not handled by the migration.
+      'fast_404' => [
+        'enabled' => TRUE,
+        'paths' => '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i',
+        'exclude_paths' => '/\/(?:styles|imagecache)\//',
+        'html' => '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>',
+      ],
+      'js' => [
+        'preprocess' => FALSE,
+        // gzip is not handled by the migration.
+        'gzip' => TRUE,
+      ],
+      // stale_file_threshold is not handled by the migration.
+      'stale_file_threshold' => 2592000,
+      'response' => [
+        'gzip' => TRUE,
+      ],
+    ],
+    'system.rss' => [
+      'channel' => [
+        'description' => '',
+      ],
+      'items' => [
+        'limit' => 27,
+        'view_mode' => 'fulltext',
+      ],
+      'langcode' => 'en',
+    ],
+    'system.site' => [
+      // uuid is not handled by the migration.
+      'uuid' => '',
+      'name' => 'The Site Name',
+      'mail' => 'joseph@flattandsons.com',
+      'slogan' => 'The Slogan',
+      'page' => [
+        '403' => 'node',
+        '404' => 'node',
+        'front' => 'node',
+      ],
+      'admin_compact_mode' => TRUE,
+      'weight_select_max' => 40,
+      // langcode and default_langcode are not handled by the migration.
+      'langcode' => 'en',
+      'default_langcode' => 'en',
+    ],
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $migration = entity_load('migration', 'd7_action_settings');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_file_settings');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_authorize');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_cron');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_file');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_filter');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_image_gd');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_image');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_logging');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_maintenance');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_performance');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_rss');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+
+    $migration = entity_load('migration', 'd7_system_site');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+  }
+
+}