diff --git a/realname.info.yml b/realname.info.yml
index 251bfd9..3b46de8 100644
--- a/realname.info.yml
+++ b/realname.info.yml
@@ -3,5 +3,6 @@ type: module
 description: 'Provides token-based name displays for users.'
 configure: realname.admin_settings_form
 core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - token:token
diff --git a/realname.module b/realname.module
index 4e04b28..b07b867 100644
--- a/realname.module
+++ b/realname.module
@@ -248,7 +248,7 @@ function realname_update(User $account) {
 
   // Clear the entity cache.
   /** @var \Drupal\user\UserStorageInterface $user_storage */
-  $user_storage = \Drupal::getContainer()->get('entity.manager')->getStorage('user');
+  $user_storage = \Drupal::entityTypeManager()->getStorage('user');
   $user_storage->resetCache([$account->id()]);
 
   return $realname;
@@ -261,7 +261,7 @@ function realname_update(User $account) {
  *   A user ID.
  */
 function realname_delete($uid) {
-  return realname_delete_multiple([$uid]);
+  realname_delete_multiple([$uid]);
 }
 
 /**
@@ -288,3 +288,4 @@ function realname_delete_all() {
 /**
  * @} End of "addtogroup realname".
  */
+
diff --git a/src/Tests/RealnameBasicTest.php b/src/Tests/RealnameBasicTest.php
index 7a0400c..26f6108 100644
--- a/src/Tests/RealnameBasicTest.php
+++ b/src/Tests/RealnameBasicTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\realname\Tests;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -10,7 +11,7 @@ use Drupal\user\Entity\User;
  *
  * @group Realname
  */
-class RealnameBasicTest extends WebTestBase {
+class RealnameBasicTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
