diff --git a/tests/ZendTest/Http/ClientTest.php b/tests/ZendTest/Http/ClientTest.php
index 21f1fe6b36d..6899195f537 100644
--- a/tests/ZendTest/Http/ClientTest.php
+++ b/tests/ZendTest/Http/ClientTest.php
@@ -377,6 +377,7 @@ public function testPrepareHeadersCreateRightHttpField()
     }
 
     /**
+<<<<<<< Upstream, based on zf2/master
 <<<<<<< Upstream, based on zf2/master
      * @group 6231
      */
@@ -411,11 +412,28 @@ public function testHttpQueryParametersCastToString()
      * Test for pull request 6301
      * Previous functionality would have thrown an exception
      * This test serves to verify that exception is not thrown
+=======
+     * @group 6301
+>>>>>>> f5ea706 #6301 - adding assertion for auth type state being set
      */
     public function testCanSpecifyCustomAuthMethodsInExtendingClasses()
     {
         $client = new ExtendedClient();
+
         $client->setAuth('username', 'password', ExtendedClient::AUTH_CUSTOM);
+<<<<<<< Upstream, based on zf2/master
 >>>>>>> d0d9ac2 Unit test for self:: to static:: Http\Client update
+=======
+
+        $this->assertAttributeEquals(
+            array (
+                'user'     => 'username',
+                'password' => 'password',
+                'type'     => ExtendedClient::AUTH_CUSTOM,
+            ),
+            'auth',
+            $client
+        );
+>>>>>>> f5ea706 #6301 - adding assertion for auth type state being set
     }
 }