diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php
index de4c30adbe..8b0bc43fb0 100644
--- a/core/modules/user/src/PrivateTempStore.php
+++ b/core/modules/user/src/PrivateTempStore.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\TempStore\PrivateTempStore as CorePrivateTempStore;
 
-@trigger_error('\Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.', E_USER_DEPRECATED);
+@trigger_error('\Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.', E_USER_DEPRECATED);
 
 /**
  * In order to preserve BC alias the core exception.
@@ -20,7 +20,7 @@ class_alias('\Drupal\Core\TempStore\TempStoreException', '\Drupal\user\TempStore
  *   Use \Drupal\Core\TempStore\PrivateTempStore instead.
  *
  * @see \Drupal\Core\TempStore\PrivateTempStore
- * @see https://www.drupal.org/node/TBD
+ * @see https://www.drupal.org/node/2935639
  */
 class PrivateTempStore extends CorePrivateTempStore {
 }
diff --git a/core/modules/user/src/PrivateTempStoreFactory.php b/core/modules/user/src/PrivateTempStoreFactory.php
index f7d65ba07d..21d6bd1c4a 100644
--- a/core/modules/user/src/PrivateTempStoreFactory.php
+++ b/core/modules/user/src/PrivateTempStoreFactory.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\TempStore\PrivateTempStoreFactory as CorePrivateTempStoreFactory;
 
-@trigger_error('\Drupal\user\PrivateTempStoreFactory is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStoreFactory instead. See https://www.drupal.org/node/TBD.', E_USER_DEPRECATED);
+@trigger_error('\Drupal\user\PrivateTempStoreFactory is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStoreFactory instead. See https://www.drupal.org/node/2935639.', E_USER_DEPRECATED);
 
 /**
  * Creates a PrivateTempStore object for a given collection.
@@ -13,7 +13,7 @@
  *   Use \Drupal\Core\TempStore\PrivateTempStoreFactory instead.
  *
  * @see \Drupal\Core\TempStore\PrivateTempStoreFactory
- * @see https://www.drupal.org/node/TBD
+ * @see https://www.drupal.org/node/2935639
  */
 class PrivateTempStoreFactory extends CorePrivateTempStoreFactory {
 
diff --git a/core/modules/user/src/SharedTempStore.php b/core/modules/user/src/SharedTempStore.php
index 0f824b622a..1802110462 100644
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\TempStore\SharedTempStore as CoreSharedTempStore;
 
-@trigger_error('\Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.', E_USER_DEPRECATED);
+@trigger_error('\Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.', E_USER_DEPRECATED);
 
 /**
  * In order to preserve BC alias the core exception.
@@ -20,7 +20,7 @@ class_alias('\Drupal\Core\TempStore\TempStoreException', '\Drupal\user\TempStore
  *   Use \Drupal\Core\TempStore\SharedTempStore instead.
  *
  * @see \Drupal\Core\TempStore\SharedTempStore
- * @see https://www.drupal.org/node/TBD
+ * @see https://www.drupal.org/node/2935639
  */
 class SharedTempStore extends CoreSharedTempStore {
 }
diff --git a/core/modules/user/src/SharedTempStoreFactory.php b/core/modules/user/src/SharedTempStoreFactory.php
index 541c411cf1..c955f07f7a 100644
--- a/core/modules/user/src/SharedTempStoreFactory.php
+++ b/core/modules/user/src/SharedTempStoreFactory.php
@@ -4,7 +4,7 @@
 
 use Drupal\Core\TempStore\SharedTempStoreFactory as CoreSharedTempStoreFactory;
 
-@trigger_error('\Drupal\user\SharedTempStoreFactory is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStoreFactory instead. See https://www.drupal.org/node/TBD.', E_USER_DEPRECATED);
+@trigger_error('\Drupal\user\SharedTempStoreFactory is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStoreFactory instead. See https://www.drupal.org/node/2935639.', E_USER_DEPRECATED);
 
 /**
  * Creates a shared temporary storage for a collection.
@@ -13,7 +13,7 @@
  *   Use \Drupal\Core\TempStore\SharedTempStoreFactory instead.
  *
  * @see \Drupal\Core\TempStore\SharedTempStoreFactory
- * @see https://www.drupal.org/node/TBD
+ * @see https://www.drupal.org/node/2935639
  */
 class SharedTempStoreFactory extends CoreSharedTempStoreFactory {
 
diff --git a/core/modules/user/src/UserServiceProvider.php b/core/modules/user/src/UserServiceProvider.php
index 490716b72a..735c5c881f 100644
--- a/core/modules/user/src/UserServiceProvider.php
+++ b/core/modules/user/src/UserServiceProvider.php
@@ -12,7 +12,7 @@ class UserServiceProvider implements ServiceModifierInterface {
    */
   public function alter(ContainerBuilder $container) {
     if ($container->hasParameter('user.tempstore.expire')) {
-      @trigger_error('The container parameter "user.tempstore.expire" is deprecated. Use "core.tempstore.expire" instead. See https://www.drupal.org/node/TBD.', E_USER_DEPRECATED);
+      @trigger_error('The container parameter "user.tempstore.expire" is deprecated. Use "core.tempstore.expire" instead. See https://www.drupal.org/node/2935639.', E_USER_DEPRECATED);
       $container->setParameter('core.tempstore.expire', $container->getParameter('user.tempstore.expire'));
     }
   }
diff --git a/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php b/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
index 3d04c14b39..ae9d4cb13e 100644
--- a/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
+++ b/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
@@ -69,8 +69,8 @@ protected function setUp() {
   /**
    * Tests the UserTempStore API.
    *
-   * @expectedDeprecation \Drupal\user\SharedTempStoreFactory is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStoreFactory instead. See https://www.drupal.org/node/TBD.
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStoreFactory is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStoreFactory instead. See https://www.drupal.org/node/2935639.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testUserTempStore() {
     // Create a key/value collection.
diff --git a/core/modules/user/tests/src/Kernel/UserServiceProviderTest.php b/core/modules/user/tests/src/Kernel/UserServiceProviderTest.php
index e4ad20e00b..0c77d9a47d 100644
--- a/core/modules/user/tests/src/Kernel/UserServiceProviderTest.php
+++ b/core/modules/user/tests/src/Kernel/UserServiceProviderTest.php
@@ -23,7 +23,7 @@ class UserServiceProviderTest extends KernelTestBase {
   /**
    * Tests that core.tempstore.expire is set to user.tempstore.expire.
    *
-   * @expectedDeprecation The container parameter "user.tempstore.expire" is deprecated. Use "core.tempstore.expire" instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation The container parameter "user.tempstore.expire" is deprecated. Use "core.tempstore.expire" instead. See https://www.drupal.org/node/2935639.
    */
   public function testUserServiceProvider() {
     $this->assertEquals(1000, $this->container->getParameter('core.tempstore.expire'));
diff --git a/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php b/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php
index 7ca4e7f09f..be9376ad1d 100644
--- a/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php
+++ b/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php
@@ -101,7 +101,7 @@ protected function setUp() {
    * Tests the get() method.
    *
    * @covers ::get
-   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testGet() {
     $this->keyValue->expects($this->at(0))
@@ -126,7 +126,7 @@ public function testGet() {
    * Tests the set() method with no lock available.
    *
    * @covers ::set
-   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSetWithNoLockAvailable() {
     $this->lock->expects($this->at(0))
@@ -152,7 +152,7 @@ public function testSetWithNoLockAvailable() {
    * Tests a successful set() call.
    *
    * @covers ::set
-   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSet() {
     $this->lock->expects($this->once())
@@ -176,7 +176,7 @@ public function testSet() {
    * Tests the getMetadata() method.
    *
    * @covers ::getMetadata
-   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testGetMetadata() {
     $this->keyValue->expects($this->at(0))
@@ -201,7 +201,7 @@ public function testGetMetadata() {
    * Tests the locking in the delete() method.
    *
    * @covers ::delete
-   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testDeleteLocking() {
     $this->keyValue->expects($this->once())
@@ -229,7 +229,7 @@ public function testDeleteLocking() {
    * Tests the delete() method with no lock available.
    *
    * @covers ::delete
-   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testDeleteWithNoLockAvailable() {
     $this->keyValue->expects($this->once())
@@ -259,7 +259,7 @@ public function testDeleteWithNoLockAvailable() {
    * Tests the delete() method.
    *
    * @covers ::delete
-   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\PrivateTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\PrivateTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testDelete() {
     $this->lock->expects($this->once())
diff --git a/core/modules/user/tests/src/Unit/SharedTempStoreTest.php b/core/modules/user/tests/src/Unit/SharedTempStoreTest.php
index be25b1d90b..6b5d441968 100644
--- a/core/modules/user/tests/src/Unit/SharedTempStoreTest.php
+++ b/core/modules/user/tests/src/Unit/SharedTempStoreTest.php
@@ -93,7 +93,7 @@ protected function setUp() {
 
   /**
    * @covers ::get
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testGet() {
     $this->keyValue->expects($this->at(0))
@@ -113,7 +113,7 @@ public function testGet() {
    * Tests the getIfOwner() method.
    *
    * @covers ::getIfOwner
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testGetIfOwner() {
     $this->keyValue->expects($this->at(0))
@@ -138,7 +138,7 @@ public function testGetIfOwner() {
    * Tests the set() method with no lock available.
    *
    * @covers ::set
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSetWithNoLockAvailable() {
     $this->lock->expects($this->at(0))
@@ -164,7 +164,7 @@ public function testSetWithNoLockAvailable() {
    * Tests a successful set() call.
    *
    * @covers ::set
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSet() {
     $this->lock->expects($this->once())
@@ -188,7 +188,7 @@ public function testSet() {
    * Tests the setIfNotExists() methods.
    *
    * @covers ::setIfNotExists
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSetIfNotExists() {
     $this->keyValue->expects($this->once())
@@ -203,7 +203,7 @@ public function testSetIfNotExists() {
    * Tests the setIfOwner() method when no key exists.
    *
    * @covers ::setIfOwner
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSetIfOwnerWhenNotExists() {
     $this->keyValue->expects($this->once())
@@ -217,7 +217,7 @@ public function testSetIfOwnerWhenNotExists() {
    * Tests the setIfOwner() method when a key already exists but no object.
    *
    * @covers ::setIfOwner
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSetIfOwnerNoObject() {
     $this->keyValue->expects($this->once())
@@ -236,7 +236,7 @@ public function testSetIfOwnerNoObject() {
    * Tests the setIfOwner() method with matching and non matching owners.
    *
    * @covers ::setIfOwner
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testSetIfOwner() {
     $this->lock->expects($this->once())
@@ -261,7 +261,7 @@ public function testSetIfOwner() {
    * Tests the getMetadata() method.
    *
    * @covers ::getMetadata
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testGetMetadata() {
     $this->keyValue->expects($this->at(0))
@@ -286,7 +286,7 @@ public function testGetMetadata() {
    * Tests the delete() method.
    *
    * @covers ::delete
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testDelete() {
     $this->lock->expects($this->once())
@@ -310,7 +310,7 @@ public function testDelete() {
    * Tests the delete() method with no lock available.
    *
    * @covers ::delete
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testDeleteWithNoLockAvailable() {
     $this->lock->expects($this->at(0))
@@ -336,7 +336,7 @@ public function testDeleteWithNoLockAvailable() {
    * Tests the deleteIfOwner() method.
    *
    * @covers ::deleteIfOwner
-   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/TBD.
+   * @expectedDeprecation \Drupal\user\SharedTempStore is scheduled for removal in Drupal 9.0.0. Use \Drupal\Core\TempStore\SharedTempStore instead. See https://www.drupal.org/node/2935639.
    */
   public function testDeleteIfOwner() {
     $this->lock->expects($this->once())
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 60fd873f71..f0c7354e2a 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -51,13 +51,13 @@ services:
   user.private_tempstore:
     class: Drupal\user\PrivateTempStoreFactory
     arguments: ['@keyvalue.expirable', '@lock', '@current_user', '@request_stack', '%core.tempstore.expire%']
-    deprecated: The "%service_id%" service is deprecated. You should use the 'core.private_tempstore' service instead.
+    deprecated: The "%service_id%" service is deprecated. You should use the 'core.private_tempstore' service instead. See https://www.drupal.org/node/2935639.
     tags:
       - { name: backend_overridable }
   user.shared_tempstore:
     class: Drupal\user\SharedTempStoreFactory
     arguments: ['@keyvalue.expirable', '@lock', '@request_stack', '%core.tempstore.expire%']
-    deprecated: The "%service_id%" service is deprecated. You should use the 'core.shared_tempstore' service instead.
+    deprecated: The "%service_id%" service is deprecated. You should use the 'core.shared_tempstore' service instead. See https://www.drupal.org/node/2935639.
     tags:
       - { name: backend_overridable }
   user.permissions:
diff --git a/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php b/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
index eb8d8055de..6be7102433 100644
--- a/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
+++ b/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
@@ -11,7 +11,7 @@
 /**
  * Tests the temporary object storage system.
  *
- * @group user
+ * @group TempStore
  * @see \Drupal\Core\TempStore\SharedTempStore
  */
 class TempStoreDatabaseTest extends KernelTestBase {
@@ -21,12 +21,12 @@ class TempStoreDatabaseTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = ['system', 'user'];
+  public static $modules = ['system'];
 
   /**
    * A key/value store factory.
    *
-   * @var \Drupal\user\SharedTempStoreFactory
+   * @var \Drupal\Core\TempStore\SharedTempStoreFactory
    */
   protected $storeFactory;
 
@@ -37,13 +37,6 @@ class TempStoreDatabaseTest extends KernelTestBase {
    */
   protected $collection;
 
-  /**
-   * An array of (fake) user IDs.
-   *
-   * @var array
-   */
-  protected $users = [];
-
   /**
    * An array of random stdClass objects.
    *
diff --git a/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php b/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php
index 75e7927377..0144919b24 100644
--- a/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php
+++ b/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php
@@ -29,9 +29,9 @@ class PrivateTempStoreTest extends UnitTestCase {
   protected $lock;
 
   /**
-   * The user temp store.
+   * The temp store.
    *
-   * @var \Drupal\user\PrivateTempStore
+   * @var \Drupal\Core\TempStore\PrivateTempStore
    */
   protected $tempStore;
 
diff --git a/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php b/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php
index ede9d148be..55a78b9a25 100644
--- a/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php
+++ b/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php
@@ -29,9 +29,9 @@ class SharedTempStoreTest extends UnitTestCase {
   protected $lock;
 
   /**
-   * The user temp store.
+   * The temp store.
    *
-   * @var \Drupal\user\SharedTempStore
+   * @var \Drupal\Core\TempStore\SharedTempStore
    */
   protected $tempStore;