diff --git a/lib/pool.js b/lib/pool.js
index 67140e6b9..c9268df3e 100644
--- a/lib/pool.js
+++ b/lib/pool.js
@@ -41,12 +41,13 @@ var pools = {
               pool.destroy(client);
             }
           });
-
+          client.poolCount = 0;
           return cb(null, client);
         });
       },
       destroy: function(client) {
         client._destroying = true;
+        client.poolCount = undefined;
         client.end();
       }
     });
@@ -66,6 +67,7 @@ var pools = {
           cb = domain.bind(cb);
         }
         if(err)  return cb(err, null, function() {/*NOOP*/});
+        client.poolCount++;
         cb(null, client, function(err) {
           if(err) {
             pool.destroy(client);
diff --git a/test/unit/pool/basic-tests.js b/test/unit/pool/basic-tests.js
index 499711f63..1e54672d4 100644
--- a/test/unit/pool/basic-tests.js
+++ b/test/unit/pool/basic-tests.js
@@ -177,3 +177,38 @@ test('fetching pool by object', function() {
   });
   assert.equal(p, p2);
 });
+
+
+test('pool#connect client.poolCount', function() {
+  var p = pools.getOrCreate(poolId++);
+  var tid;
+
+  setConnectTimeout = function() {
+    tid = setTimeout(function() {
+      throw new Error("Connection callback was never called");
+    }, 100);
+  }
+
+  setConnectTimeout();
+  p.connect(function(err, client, done) {
+    clearTimeout(tid);
+    assert.equal(client.poolCount, 1,
+      'after connect, poolCount should be 1');
+    done();
+    assert.equal(client.poolCount, 1,
+      'after returning client to pool, poolCount should still be 1');
+    setConnectTimeout();
+    p.connect(function(err, client, done) {
+      clearTimeout(tid);
+      assert.equal(client.poolCount, 2,
+        'after second connect, poolCount should be 2');
+      done();
+      setConnectTimeout();
+      p.destroyAllNow(function() {
+        clearTimeout(tid);
+        assert.equal(client.poolCount, undefined,
+          'after pool is destroyed, count should be undefined');
+      });
+    })
+  });
+});