diff --git a/core/core.services.yml b/core/core.services.yml
index a9b8c3e..bb8e4bc 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -301,9 +301,6 @@ services:
   lock:
     class: Drupal\Core\Lock\DatabaseLockBackend
     arguments: ['@database']
-  user.tempstore:
-    class: Drupal\user\TempStoreFactory
-    arguments: ['@serialization.phpserialize', '@database', '@lock']
   router.request_context:
     class: Symfony\Component\Routing\RequestContext
     tags:
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 33fe88a..03bb4c2 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -46,3 +46,6 @@ services:
   user.auth:
     class: Drupal\user\UserAuth
     arguments: ['@entity.manager', '@password']
+  user.tempstore:
+    class: Drupal\user\TempStoreFactory
+    arguments: ['@serialization.phpserialize', '@database', '@lock']
diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
index e938a58..94014f4 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
@@ -24,6 +24,13 @@ class ModuleTest extends ViewUnitTestBase {
   public static $testViews = array('test_view_status', 'test_view');
 
   /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user', 'block');
+
+  /**
    * Stores the last triggered error, for example via debug().
    *
    * @var string
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/BlockDependenciesTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/BlockDependenciesTest.php
index 42db1e0..dd2d2e8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/BlockDependenciesTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/BlockDependenciesTest.php
@@ -26,7 +26,7 @@ class BlockDependenciesTest extends ViewUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'block');
+  public static $modules = array('node', 'block', 'user');
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php
index b654289..78bb214 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php
@@ -23,7 +23,7 @@ class WizardPluginBaseUnitTest extends ViewUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'system');
+  public static $modules = array('language', 'system', 'user');
 
   /**
    * Contains thw wizard plugin manager.
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php
index db67fde..db2df4f 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php
@@ -20,7 +20,7 @@ class TagTest extends ViewUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'views_ui');
+  public static $modules = array('views', 'views_ui', 'user');
 
   public static function getInfo() {
     return array(