diff --git a/lib/Cake/Test/Case/Network/CakeSocketTest.php b/lib/Cake/Test/Case/Network/CakeSocketTest.php
index 0cee94c383f..cc30d3f60fa 100644
--- a/lib/Cake/Test/Case/Network/CakeSocketTest.php
+++ b/lib/Cake/Test/Case/Network/CakeSocketTest.php
@@ -179,11 +179,18 @@ public function testTimeOutConnection() {
 		$config = array('host' => '127.0.0.1', 'timeout' => 0.5);
 		$this->Socket = new CakeSocket($config);
 		$this->assertTrue($this->Socket->connect());
+	}
 
+/**
+ * test timing out raises exception
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage Operation timed out
+ */
+	public function testTimeOutThrowException() {
 		$config = array('host' => '127.0.0.1', 'timeout' => 0.00001);
 		$this->Socket = new CakeSocket($config);
-		$this->assertFalse($this->Socket->read(1024 * 1024));
-		$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
+		$this->Socket->read(1024 * 1024);
 	}
 
 /**