diff --git a/core/modules/locale/config/tour.tour.locale.yml b/core/modules/locale/config/install/tour.tour.locale.yml
similarity index 100%
rename from core/modules/locale/config/tour.tour.locale.yml
rename to core/modules/locale/config/install/tour.tour.locale.yml
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php
index 8593bae..a398e5f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeSettingsTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\Theme;
 
+use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\simpletest\DrupalUnitTestBase;
 
@@ -54,7 +55,7 @@ function setUp() {
   function testDefaultConfig() {
     $name = 'test_basetheme';
     $path = $this->availableThemes[$name]->getPath();
-    $this->assertTrue(file_exists("$path/config/$name.settings.yml"));
+    $this->assertTrue(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
     $this->container->get('theme_handler')->enable(array($name));
     $this->assertIdentical(theme_get_setting('base', $name), 'only');
   }
@@ -65,7 +66,7 @@ function testDefaultConfig() {
   function testNoDefaultConfig() {
     $name = 'stark';
     $path = $this->availableThemes[$name]->getPath();
-    $this->assertFalse(file_exists("$path/config/$name.settings.yml"));
+    $this->assertFalse(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
     $this->container->get('theme_handler')->enable(array($name));
     $this->assertNotNull(theme_get_setting('features.favicon', $name));
   }
diff --git a/core/modules/system/tests/themes/test_basetheme/config/test_basetheme.settings.yml b/core/modules/system/tests/themes/test_basetheme/config/install/test_basetheme.settings.yml
similarity index 100%
rename from core/modules/system/tests/themes/test_basetheme/config/test_basetheme.settings.yml
rename to core/modules/system/tests/themes/test_basetheme/config/install/test_basetheme.settings.yml