diff --git a/lib/tls.js b/lib/tls.js
index 0acbb25749..42ef746587 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -166,13 +166,18 @@ CryptoStream.prototype.resume = function() {
 };
 
 
-CryptoStream.prototype.setTimeout = function(n) {
-  if (this.socket) this.socket.setTimeout(n);
+CryptoStream.prototype.setTimeout = function(timeout, callback) {
+  if (this.socket) this.socket.setTimeout(timeout, callback);
 };
 
 
-CryptoStream.prototype.setNoDelay = function() {
-  if (this.socket) this.socket.setNoDelay();
+CryptoStream.prototype.setNoDelay = function(noDelay) {
+  if (this.socket) this.socket.setNoDelay(noDelay);
+};
+
+
+CryptoStream.prototype.setKeepAlive = function(enable, initialDelay) {
+  if (this.socket) this.socket.setNoDelay(enable, initialDelay);
 };
 
 
diff --git a/test/simple/test-https-socket-options.js b/test/simple/test-https-socket-options.js
new file mode 100644
index 0000000000..f0216647ba
--- /dev/null
+++ b/test/simple/test-https-socket-options.js
@@ -0,0 +1,83 @@
+// 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.
+
+
+
+
+if (!process.versions.openssl) {
+  console.error('Skipping because node compiled without OpenSSL.');
+  process.exit(0);
+}
+
+var common = require('../common');
+var assert = require('assert');
+
+var fs = require('fs');
+var exec = require('child_process').exec;
+
+var http = require('http');
+var https = require('https');
+
+var options = {
+  key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
+  cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+};
+
+var body = 'hello world\n';
+
+// Try first with http server
+
+var server_http = http.createServer(function(req, res) {
+  console.log('got HTTP request');
+  res.writeHead(200, { 'content-type': 'text/plain' });
+  res.end(body);
+});
+
+
+server_http.listen(common.PORT, function() {
+  var req = http.request({ port: common.PORT }, function(res) {
+    server_http.close();
+  });
+  // These methods should exist on the request and get passed down to the socket
+  req.setNoDelay(true);
+  req.setTimeout(1000, function() { });
+  req.setSocketKeepAlive(true, 1000);
+  req.end();
+});
+
+// Then try https server (requires functions to be mirroed in tls.js's CryptoStream)
+
+var server_https = https.createServer(options, function(req, res) {
+  console.log('got HTTPS request');
+  res.writeHead(200, { 'content-type': 'text/plain' });
+  res.end(body);
+});
+
+server_https.listen(common.PORT+1, function() {
+  var req = https.request({ port: common.PORT+1 }, function(res) {
+    server_https.close();
+  });
+  // These methods should exist on the request and get passed down to the socket
+  req.setNoDelay(true);
+  req.setTimeout(1000, function() { });
+  req.setSocketKeepAlive(true, 1000);
+  req.end();
+});