diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index f88a16e67..263dcb585 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -674,7 +674,7 @@ class HttpSocket extends CakeSocket {
  * Parses and sets the specified URI into current request configuration.
  *
  * @param mixed $uri URI, See HttpSocket::_parseUri()
- * @return array Current configuration settings
+ * @return boolean If uri has merged in config
  */
 	protected function _configUri($uri = null) {
 		if (empty($uri)) {
@@ -697,7 +697,7 @@ class HttpSocket extends CakeSocket {
 		);
 		$this->config = Set::merge($this->config, $config);
 		$this->config = Set::merge($this->config, array_intersect_key($this->config['request']['uri'], $this->config));
-		return $this->config;
+		return true;
 	}
 
 /**
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index df4914ec3..d589f11a3 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -290,12 +290,12 @@ class HttpSocketTest extends CakeTestCase {
 			)
 		);
 		$this->assertEquals($this->Socket->config, $expected);
-		$this->assertEquals($r, $expected);
+		$this->assertTrue($r);
 		$r = $this->Socket->configUri(array('host' => 'www.foo-bar.org'));
 		$expected['host'] = 'www.foo-bar.org';
 		$expected['request']['uri']['host'] = 'www.foo-bar.org';
 		$this->assertEquals($this->Socket->config, $expected);
-		$this->assertEquals($r, $expected);
+		$this->assertTrue($r);
 
 		$r = $this->Socket->configUri('http://www.foo.com');
 		$expected = array(
@@ -314,13 +314,13 @@ class HttpSocketTest extends CakeTestCase {
 			)
 		);
 		$this->assertEquals($this->Socket->config, $expected);
-		$this->assertEquals($r, $expected);
+		$this->assertTrue($r);
 		$r = $this->Socket->configUri('/this-is-broken');
 		$this->assertEquals($this->Socket->config, $expected);
-		$this->assertEquals($r, false);
+		$this->assertFalse($r);
 		$r = $this->Socket->configUri(false);
 		$this->assertEquals($this->Socket->config, $expected);
-		$this->assertEquals($r, false);
+		$this->assertFalse($r);
 	}
 
 /**