diff --git a/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php b/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
index c0067c9..67fb1d0 100644
--- a/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
@@ -25,12 +25,18 @@ class HandlerFieldUserNameTest extends UserTestBase {
   public static $testViews = array('test_views_handler_field_user_name');
 
   public function testUserName() {
-    $this->drupalLogin($this->drupalCreateUser(array('access user profiles')));
+    $account = $this->drupalCreateUser(array('access user profiles'));
+    $account2 = $this->drupalCreateUser();
+    $account2 = user_load($account2->id());
+    $this->drupalLogin($account);
 
+    // Set defaults.
     $view = Views::getView('test_views_handler_field_user_name');
+    $view->initHandlers();
+    $view->field['name']->options['link_to_user'] = TRUE;
+    $view->field['name']->init($view, $view->getDisplay('default'));
     $this->executeView($view);
 
-    $view->field['name']->options['link_to_user'] = TRUE;
     $username = $view->result[0]->users_field_data_name = $this->randomMachineName();
     $view->result[0]->users_field_data_uid = 1;
     $render = $view->field['name']->advancedRender($view->result[0]);
@@ -53,6 +59,26 @@ public function testUserName() {
     $anon_name = $view->field['name']->options['anonymous_text'] = $this->randomMachineName();
     $render = $view->field['name']->advancedRender($view->result[0]);
     $this->assertIdentical($render, $anon_name , 'For user0 it should use the configured anonymous text if overwrite_anonymous is checked.');
+
+    $this->drupalLogin($account2);
+    $this->executeView($view);
+    $view->field['name']->options['overwrite_anonymous'] = TRUE;
+    $anon_name = $view->field['name']->options['anonymous_text'] = $this->randomMachineName();
+    $render = $view->field['name']->advancedRender($view->result[0]);
+    $this->assertNotIdentical()Identical($render, $anon_name , 'For admin it should not use the configured anonymous text if overwrite_anonymous is checked.');
+  }
+
+  /**
+   * Tests that the field handler works when no additional fields are added.
+   */
+  public function testNoAdditionalFields() {
+    $view = Views::getView('test_views_handler_field_user_name');
+    $this->executeView($view);
+
+    $username = $view->result[0]->users_field_data_name = $this->randomMachineName();
+    $view->result[0]->users_field_data_uid = 1;
+    $render = $view->field['name']->advancedRender($view->result[0]);
+    $this->assertTrue(strpos($render, $username) !== FALSE, 'If link to user is checked the username should be part of the output.');
   }
 
 }
diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
index 9a9bac5..8f2a9ee 100644
--- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
+++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
@@ -36,8 +36,9 @@ display:
           hide_empty: false
           id: name
           label: ''
-          link_to_user: true
+          link_to_user: false
           overwrite_anonymous: false
+          format_username: false
           table: users_field_data
           plugin_id: user_name
           entity_type: user