diff --git a/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php b/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
index 44144ef..b445a5f 100644
--- a/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
+++ b/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
@@ -93,7 +93,7 @@ public function testDateTimezone() {
     $this->drupalPostForm('user/' . $test_user->id() . '/edit', $edit, t('Save'));
 
     \Drupal::entityManager()->getStorage('user')->resetCache();
-    $this->container->get('current_user')->setAccount(User::load($test_user->id()));
+    \Drupal::service('account_switcher')->switchTo(User::load($test_user->id()));
 
     // Create a date object with an unspecified timezone, which should
     // end up using the user timezone.