diff --git a/lib/_http_agent.js b/lib/_http_agent.js
index 6ea801c3ed..8b79d14ff1 100644
--- a/lib/_http_agent.js
+++ b/lib/_http_agent.js
@@ -206,37 +206,41 @@ Agent.prototype.createSocket = function(req, options, cb) {
     }
     self.sockets[name].push(s);
     debug('sockets', name, self.sockets[name].length);
-
-    function onFree() {
-      self.emit('free', s, options);
-    }
-    s.on('free', onFree);
-
-    function onClose(err) {
-      debug('CLIENT socket onClose');
-      // This is the only place where sockets get removed from the Agent.
-      // If you want to remove a socket from the pool, just close it.
-      // All socket errors end in a close event anyway.
-      self.removeSocket(s, options);
-    }
-    s.on('close', onClose);
-
-    function onRemove() {
-      // We need this function for cases like HTTP 'upgrade'
-      // (defined by WebSockets) where we need to remove a socket from the
-      // pool because it'll be locked up indefinitely
-      debug('CLIENT socket onRemove');
-      self.removeSocket(s, options);
-      s.removeListener('close', onClose);
-      s.removeListener('free', onFree);
-      s.removeListener('agentRemove', onRemove);
-    }
-    s.on('agentRemove', onRemove);
+    installListeners(self, s, options);
     cb(null, s);
   }
 };
 
-Agent.prototype.removeSocket = function(s, options) {
+function installListeners(agent, s, options) {
+  function onFree() {
+    debug('CLIENT socket onFree');
+    agent.emit('free', s, options);
+  }
+  s.on('free', onFree);
+
+  function onClose(err) {
+    debug('CLIENT socket onClose');
+    // This is the only place where sockets get removed from the Agent.
+    // If you want to remove a socket from the pool, just close it.
+    // All socket errors end in a close event anyway.
+    agent.removeSocket(s, options);
+  }
+  s.on('close', onClose);
+
+  function onRemove() {
+    // We need this function for cases like HTTP 'upgrade'
+    // (defined by WebSockets) where we need to remove a socket from the
+    // pool because it'll be locked up indefinitely
+    debug('CLIENT socket onRemove');
+    agent.removeSocket(s, options);
+    s.removeListener('close', onClose);
+    s.removeListener('free', onFree);
+    s.removeListener('agentRemove', onRemove);
+  }
+  s.on('agentRemove', onRemove);
+}
+
+Agent.prototype.removeSocket = function removeSocket(s, options) {
   var name = this.getName(options);
   debug('removeSocket', name, 'writable:', s.writable);
   var sets = [this.sockets];