diff --git a/test/simple/test-http-client-agent.js b/test/simple/test-http-client-agent.js
new file mode 100644
index 00000000000..edf064a25ce
--- /dev/null
+++ b/test/simple/test-http-client-agent.js
@@ -0,0 +1,66 @@
+// 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 http = require('http');
+
+var name = 'localhost:' + common.PORT;
+var max = 3;
+var count = 0;
+
+var server = http.Server(function(req, res) {
+  if (req.url === '/0') {
+    setTimeout(function() {
+      res.writeHead(200);
+      res.end('Hello, World!');
+    }, 100);
+  } else {
+    res.writeHead(200);
+    res.end('Hello, World!');
+  }
+});
+server.listen(common.PORT, function() {
+  for (var i = 0; i < max; ++i) {
+    request(i);
+  }
+});
+
+function request(i) {
+  var req = http.get({
+    port: common.PORT,
+    path: '/' + i
+  }, function(res) {
+    var socket = req.socket;
+    socket.on('close', function() {
+      ++count;
+      assert.equal(http.globalAgent.sockets[name].length, max - count);
+      assert.equal(http.globalAgent.sockets[name].indexOf(socket), -1);
+      if (count === max) {
+        server.close();
+      }
+    });
+  });
+}
+
+process.on('exit', function() {
+  assert.equal(count, max);
+});