diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
index b6768b1b0e6f62252066c623dfe88b35fe1c0e19..2f630fbcb74f910fa22f58f0dd6216194b394f81 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
@@ -26,6 +26,7 @@ protected function setUp(): void {
     parent::setUp();
 
     $this->container->get('current_user')
+      ->getAccount()
       ->addRole($this->drupalCreateRole([
         'access contextual links',
       ]));
diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
index e2b4b820ad8dfddf573936bb82429214fe1ccdf0..6a9e6717ac0ba7e2ce1dea880552c99cefcfa6f9 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
@@ -136,6 +136,7 @@ public function testAccessUnpublished($allowed_to_view_unpublished, $expected_re
     // Are we testing as a user who is allowed to view the embedded entity?
     if ($allowed_to_view_unpublished) {
       $this->container->get('current_user')
+        ->getAccount()
         ->addRole($this->drupalCreateRole(['view own unpublished media']));
     }
 
diff --git a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
index 1f39eef6db645980bc02fa99df9d7c14e6863d6d..dcf5065785a716fb98ad85541a09a5e8404f3b36 100644
--- a/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
+++ b/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
@@ -86,7 +86,7 @@ protected function setUp(): void {
       'access content',
       'view media',
     ]);
-    $this->container->set('current_user', $user);
+    $this->container->get('current_user')->setAccount($user);
 
     $this->image = File::create([
       'uri' => $this->getTestFiles('image')[0]->uri,
diff --git a/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php b/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php
index 779f72b698a69d9ac3cee5703f4e158daf183d47..95bf84056da7a2bfca4356196abced03b6dce179 100644
--- a/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php
+++ b/core/modules/user/tests/src/Kernel/UserAccountFormPasswordResetTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void {
     $this->user->save();
 
     // Set current user.
-    $this->container->set('current_user', $this->user);
+    $this->container->get('current_user')->setAccount($this->user);
     // Install the router table and then rebuild.
     \Drupal::service('router.builder')->rebuild();
   }