diff -u b/core/lib/Drupal/Core/Session/UserSession.php b/core/lib/Drupal/Core/Session/UserSession.php
--- b/core/lib/Drupal/Core/Session/UserSession.php
+++ b/core/lib/Drupal/Core/Session/UserSession.php
@@ -141,7 +141,7 @@
       return TRUE;
     }
 
-    return \Drupal::entityManager()->getStorage('user_role')->isPermissionInRoles($permission, $this->getRoles());
+    return $this->getRoleStorage()->isPermissionInRoles($permission, $this->getRoles());
   }
 
   /**
@@ -244,2 +244,12 @@
 
+  /**
+   * Returns the role storage object.
+   *
+   * @return \Drupal\user\RoleStorageInterface
+   *   The role storage object.
+   */
+  protected function getRoleStorage() {
+    return \Drupal::entityManager()->getStorage('user_role');
+  }
+
 }
diff -u b/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php
--- b/core/modules/user/src/Entity/User.php
+++ b/core/modules/user/src/Entity/User.php
@@ -244,7 +244,7 @@
       return TRUE;
     }
 
-    return \Drupal::entityManager()->getStorage('user_role')->isPermissionInRoles($permission, $this->getRoles());
+    return $this->getRoleStorage()->isPermissionInRoles($permission, $this->getRoles());
   }
 
   /**
@@ -530,2 +530,12 @@
 
+  /**
+   * Returns the role storage object.
+   *
+   * @return \Drupal\user\RoleStorageInterface
+   *   The role storage object.
+   */
+  protected function getRoleStorage() {
+    return \Drupal::entityManager()->getStorage('user_role');
+  }
+
 }