diff --git a/core/modules/user/tests/modules/user_access_test/user_access_test.module b/core/modules/user/tests/modules/user_access_test/user_access_test.module
index 9f60bd21c9..599846ae4d 100644
--- a/core/modules/user/tests/modules/user_access_test/user_access_test.module
+++ b/core/modules/user/tests/modules/user_access_test/user_access_test.module
@@ -31,13 +31,15 @@ function user_access_test_user_access(User $entity, $operation, $account) {
  */
 function user_access_test_entity_field_access($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) {
   // Allow view access for status, init and mail fields.
-  if ($field_definition->getName() == 'status' && $operation == 'view') {
+  $field_definition_name = $field_definition->getName();
+  $access_fields = array('status','init','mail');
+  if ($operation === 'view' && in_array($field_definition_name, $access_fields)) {
     return AccessResult::allowed();
   }
-  if ($field_definition->getName() == 'init' && $operation == 'view') {
+  if ($operation === 'view' && in_array($field_definition_name, $access_fields)) {
     return AccessResult::allowed();
   }
-  if ($field_definition->getName() == 'mail' && $operation == 'view') {
+  if ($operation === 'view' && in_array($field_definition_name, $access_fields)) {
     return AccessResult::allowed();
   }
   return AccessResult::neutral();