diff --git a/lib/tls.js b/lib/tls.js
index 49ca0c4898..295c95a630 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -876,10 +876,16 @@ function pipe(pair, socket) {
   function onclose() {
     socket.removeListener('error', onerror);
     socket.removeListener('close', onclose);
+    socket.removeListener('timeout', ontimeout);
+  }
+
+  function ontimeout() {
+    cleartext.emit('timeout');
   }
 
   socket.on('error', onerror);
   socket.on('close', onclose);
+  socket.on('timeout', ontimeout);
 
   return cleartext;
 }
diff --git a/test/simple/test-tls-request-timeout.js b/test/simple/test-tls-request-timeout.js
new file mode 100644
index 0000000000..d7ed7016d1
--- /dev/null
+++ b/test/simple/test-tls-request-timeout.js
@@ -0,0 +1,50 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var tls = require('tls');
+var fs = require('fs');
+
+var hadTimeout = false;
+
+var options = {
+  key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
+  cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+};
+
+var server = tls.Server(options, function(socket) {
+  socket.setTimeout(100);
+
+  socket.on('timeout', function(err) {
+    hadTimeout = true;
+    socket.end();
+    server.close();
+  });
+});
+
+server.listen(common.PORT, function() {
+  var socket = tls.connect(common.PORT);
+});
+
+process.on('exit', function() {
+  assert.ok(hadTimeout);
+});