diff --git a/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php
index b7424f3..aa5b950 100644
--- a/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/DefaultConfigTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\config\Tests;
 
 use Drupal\config_test\TestInstallStorage;
-use Drupal\config_test\TestSchemaStorage;
 use Drupal\Core\Config\Schema\Property;
 use Drupal\Core\Config\TypedConfigManager;
 use Drupal\Core\TypedData\Type\BooleanInterface;
@@ -70,7 +69,7 @@ public function testDefaultConfig() {
     // every module, profile and theme.
     $typed_config = new TypedConfigManager(
       \Drupal::service('config.storage'),
-      new TestSchemaStorage(),
+      new TestInstallStorage('config/schema'),
       \Drupal::service('cache.config')
     );
 
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/TestSchemaStorage.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/TestSchemaStorage.php
deleted file mode 100644
index dd782a9..0000000
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/TestSchemaStorage.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config_test\TestSchemaStorage.
- */
-
-namespace Drupal\config_test;
-
-use Drupal\Core\Config\Schema\SchemaStorage;
-use Drupal\Core\Extension\ExtensionDiscovery;
-
-/**
- * Tests configuration schemas of profiles, modules and themes.
- *
- * A test configuration schema storage to read configuration schema from all
- * profiles, modules and themes regardless of installation status or installed
- * profile.
- */
-class TestSchemaStorage extends SchemaStorage {
-
-  /**
-   * Overrides Drupal\Core\Config\ExtensionInstallStorage::__construct().
-   */
-  public function __construct() {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getAllFolders() {
-    if (!isset($this->folders)) {
-      $this->folders = $this->getComponentNames('core', array('core'));
-      // @todo Refactor getComponentNames() to use the extension list directly.
-      $listing = new ExtensionDiscovery();
-      $listing->setProfileDirectories(array());
-      $this->folders += $this->getComponentNames('profile', array_keys($listing->scan('profile')));
-      $this->folders += $this->getComponentNames('module', array_keys($listing->scan('module')));
-      $this->folders += $this->getComponentNames('theme', array_keys($listing->scan('theme')));
-    }
-    return $this->folders;
-  }
-
-}