diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php
index d9ced7d..729dbc9 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php
@@ -56,14 +56,7 @@ public function setUp() {
   public function testActionSettings() {
     $config = \Drupal::config('action.settings');
     $this->assertIdentical($config->get('recursion_limit'), 35);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('action.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php
index ba24aad..9bf5759 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php
@@ -62,14 +62,7 @@ public function testAggregatorSettings() {
     $this->assertIdentical($config->get('items.allowed_html'), '<a> <b> <br /> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>');
     $this->assertIdentical($config->get('items.expire'), 9676800);
     $this->assertIdentical($config->get('source.list_max'), 3);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('aggregator.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'aggregator.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'aggregator.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php
index 07fcfb0..890a235 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php
@@ -59,14 +59,7 @@ public function testBookSettings() {
     $this->assertIdentical($config->get('child_type'), 'book');
     $this->assertIdentical($config->get('block.navigation.mode'), 'all pages');
     $this->assertIdentical($config->get('allowed_types'), array('book'));
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('book.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'book.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'book.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
index 6605e08..601d109 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
@@ -68,14 +68,7 @@ public function testContactSettings() {
     $this->assertIdentical($config->get('user_default_enabled'), true);
     $this->assertIdentical($config->get('flood.limit'), 3);
     $this->assertIdentical($config->get('default_category'), 'some_other_category');
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('contact.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'contact.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'contact.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php
index 418cbd1..f99b084 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php
@@ -57,14 +57,7 @@ public function setUp() {
   public function testBookSettings() {
     $config = \Drupal::config('dblog.settings');
     $this->assertIdentical($config->get('row_limit'), 1000);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('dblog.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
index 2fb3244..71f0cbf 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
@@ -59,14 +59,7 @@ public function testFileSettings() {
     $this->assertIdentical($config->get('description.type'), 'textfield');
     $this->assertIdentical($config->get('description.length'), 128);
     $this->assertIdentical($config->get('icon.directory'), 'sites/default/files/icons');
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('file.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'file.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'file.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php
index 38e8ab3..75a1c42 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php
@@ -64,14 +64,7 @@ public function testForumSettings() {
     $this->assertIdentical($config->get('block.active.limit'), 5);
     // This is 'forum_block_num_1' in D6, but 'block:new:limit' in D8.
     $this->assertIdentical($config->get('block.new.limit'), 5);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('forum.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'forum.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'forum.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
index ad2bcf3..5c87f5b 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
@@ -57,14 +57,7 @@ public function testLocaleSettings() {
     $config = \Drupal::config('locale.settings');
     $this->assertIdentical($config->get('cache_strings'), TRUE);
     $this->assertIdentical($config->get('javascript.directory'), 'languages');
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('locale.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'locale.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'locale.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php
index 4930db1..58a00dd 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php
@@ -58,14 +58,7 @@ public function testMenuSettings() {
     $this->assertIdentical($config->get('main_links'), 'primary-links');
     $this->assertIdentical($config->get('secondary_links'), 'secondary-links');
     $this->assertIdentical($config->get('override_parent_selector'), FALSE);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('menu_ui.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'menu_ui.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'menu_ui.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
index 6674bf9..fec1953 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
@@ -57,15 +57,7 @@ public function setUp() {
   public function testNodeSettings() {
     $config = \Drupal::config('node.settings');
     $this->assertIdentical($config->get('use_admin_theme'), false);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'node.settings', $config->get());
   }
 
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('node.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'node.settings', $config_data);
-  }
-
-
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php
index ca4a25f..51f5f16 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php
@@ -59,14 +59,7 @@ public function testSearchSettings() {
     $this->assertIdentical($config->get('index.minimum_word_size'), 3);
     $this->assertIdentical($config->get('index.overlap_cjk'), TRUE);
     $this->assertIdentical($config->get('index.cron_limit'), 100);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('search.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'search.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'search.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php
index ad5b79a..e6bc1c1 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php
@@ -63,14 +63,7 @@ public function testSimpletestSettings() {
     $this->assertIdentical($config->get('httpauth.password'), '');
     $this->assertIdentical($config->get('httpauth.username'), '');
     $this->assertIdentical($config->get('verbose'), TRUE);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('simpletest.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php
index d04170f..c122820 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php
@@ -62,14 +62,7 @@ public function testStatisticsSettings() {
     $this->assertIdentical($config->get('block.popular.top_day_limit'), 0);
     $this->assertIdentical($config->get('block.popular.top_all_limit'), 0);
     $this->assertIdentical($config->get('block.popular.top_recent_limit'), 0);
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('statistics.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php
index d8222ac..d5c432f 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php
@@ -57,14 +57,7 @@ public function testSyslogSettings() {
     $config = \Drupal::config('syslog.settings');
     $this->assertIdentical($config->get('identity'), 'drupal');
     $this->assertIdentical($config->get('facility'), '128');
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('syslog.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'syslog.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'syslog.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php
index 994ef8c..5c31f48 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php
@@ -57,13 +57,7 @@ public function testTaxonomySettings() {
     $config = \Drupal::config('taxonomy.settings');
     $this->assertIdentical($config->get('terms_per_page_admin'), 100);
     $this->assertIdentical($config->get('override_selector'), FALSE);
-  }
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('taxonomy.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'taxonomy.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'taxonomy.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php
index 7c3a5fd..c0ba9e2 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php
@@ -56,15 +56,7 @@ protected function setUp() {
   public function testTextSettings() {
     $config = \Drupal::config('text.settings');
     $this->assertIdentical($config->get('default_summary_length'), 456);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'text.settings', $config->get());
   }
 
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('text.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'text.settings', $config_data);
-  }
-
-
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
index 9131641..64b6d11 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
@@ -59,14 +59,7 @@ public function testUpdateSettings() {
     $this->assertIdentical($config->get('fetch.url'), 'http://updates.drupal.org/release-history');
     $this->assertIdentical($config->get('notification.threshold'), 'all');
     $this->assertIdentical($config->get('notification.emails'), array());
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('update.settings')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'update.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'update.settings', $config->get());
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php
index ba4260b..ed8cc1c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php
@@ -62,14 +62,7 @@ public function testUserMail() {
     $this->assertIdentical($config->get('register_pending_approval.body'), "!username,\n\nThank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  !site team");
     $this->assertIdentical($config->get('status_blocked.subject'), 'Account details for !username at !site (blocked)');
     $this->assertIdentical($config->get('status_blocked.body'), "!username,\n\nYour account on !site has been blocked.");
-  }
-
-  /**
-   * Tests configuration schema.
-   */
-  public function testConfigSchema() {
-    $config_data = \Drupal::config('user.mail')->get();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'user.mail', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'user.mail', $config->get());
   }
 
 }