diff -u b/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
--- b/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -77,12 +77,6 @@
       ->setFactoryClass('Drupal\Component\Utility\Settings')
       ->setFactoryMethod('getSingleton');
 
-    // Register the State k/v store as a service.
-    $container->register('state', 'Drupal\Core\KeyValueStore\KeyValueStoreInterface')
-      ->setFactoryService(new Reference('keyvalue'))
-      ->setFactoryMethod('get')
-      ->addArgument('state');
-
     // Register the Queue factory.
     $container
       ->register('queue', 'Drupal\Core\Queue\QueueFactory')
@@ -92,6 +86,12 @@
       ->register('queue.database', 'Drupal\Core\Queue\QueueDatabaseFactory')
       ->addArgument(new Reference('database'));
 
+    // Register the state k/v store as a service.
+    $container->register('state', 'Drupal\Core\KeyValueStore\KeyValueStoreInterface')
+      ->setFactoryService(new Reference('keyvalue'))
+      ->setFactoryMethod('get')
+      ->addArgument('state');
+
     $container->register('path.alias_manager', 'Drupal\Core\Path\AliasManager')
       ->addArgument(new Reference('database'))
       ->addArgument(new Reference('keyvalue'));
diff -u b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
--- b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -145,7 +145,7 @@
       // away with a simple container holding the absolute bare minimum. When
       // a kernel is overridden then there's no need to re-register the keyvalue
       // service but when a test is happy with the superminimal container put
-      // together here, it still might a keyvalue storage for anything (for 
+      // together here, it still might a keyvalue storage for anything (for
       // eg. module_enable) using state() -- that's why a memory service was
       // added in the first place.
       $container
only in patch2:
unchanged:
--- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
@@ -195,8 +195,8 @@ public function testDefaultBlocks() {
     $entities = $this->controller->load();
     $this->assertTrue(empty($entities), 'There are no blocks initially.');
 
-    // Install the block_test.module, so that its default config is installed.
-    $this->enableModules(array('block_test'));
+    // Install default config of the block_test.module.
+    config_install_default_config('module', 'block_test');
 
     $entities = $this->controller->load();
     $entity = reset($entities);
only in patch2:
unchanged:
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php
@@ -17,11 +17,11 @@
 class EditorManagerTest extends DrupalUnitTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('filter', 'editor');
+  public static $install = array('filter', 'editor');
 
   /**
    * The manager for text editor plugins.
@@ -41,9 +41,6 @@ public static function getInfo() {
   function setUp() {
     parent::setUp();
 
-    // Install the Filter module.
-    $this->enableModules(array('filter'));
-
     // Add text formats.
     $filtered_html_format = array(
       'format' => 'filtered_html',