diff --git a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
deleted file mode 100644
index 2adc4c2..0000000
--- a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\contact\Tests\ContactAuthenticatedUserTest.
- */
-
-namespace Drupal\contact\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests contact form textfields are present if authenticated.
- *
- * @group contact
- */
-class ContactAuthenticatedUserTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('contact');
-
-  /**
-   * Tests that name and email fields are not present for authenticated users.
-   */
-  function testContactSiteWideTextfieldsLoggedInTestCase() {
-    $this->drupalLogin($this->drupalCreateUser(array('access site-wide contact form')));
-    $this->drupalGet('contact');
-
-    // Ensure that there is no textfield for name.
-    $this->assertFalse($this->xpath('//input[@name=:name]', array(':name' => 'name')));
-
-    // Ensure that there is no textfield for email.
-    $this->assertFalse($this->xpath('//input[@name=:name]', array(':name' => 'mail')));
-  }
-}
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index 83f296f..70b6e6b 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -46,6 +46,27 @@ protected function setUp() {
    * Tests configuration options and the site-wide contact form.
    */
   function testSiteWideContact() {
+    // Tests name and email fields for authenticated and anonymous users.
+    $this->drupalLogin($this->drupalCreateUser(array('access site-wide contact form')));
+    $this->drupalGet('contact');
+
+    // Ensure that there is no textfield for name.
+    $this->assertFalse($this->xpath('//input[@name=:name]', array(':name' => 'name')));
+
+    // Ensure that there is no textfield for email.
+    $this->assertFalse($this->xpath('//input[@name=:name]', array(':name' => 'mail')));
+
+    //Logout and retrieve the page as an anonymous user
+    $this->drupalLogout();
+    user_role_grant_permissions('anonymous', array('access site-wide contact form'));
+    $this->drupalGet('contact');
+
+    // Now Ensure that there is textfield for name.
+    $this->assertTrue($this->xpath('//input[@name=:name]', array(':name' => 'name')));
+
+    // Now Ensure that there is textfield for email.
+    $this->assertTrue($this->xpath('//input[@name=:name]', array(':name' => 'mail')));
+
     // Create and login administrative user.
     $admin_user = $this->drupalCreateUser(array(
       'access site-wide contact form',