diff --git a/lib/defaults.js b/lib/defaults.js
index 62f2ad158..e99abef42 100644
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -35,23 +35,15 @@ module.exports = {
   // binary result mode
   binary: false,
 
-  // Connection pool options - see https://github.com/coopernurse/node-pool
+  // Connection pool options - see https://github.com/brianc/node-pg-pool
+
   // number of connections to use in connection pool
   // 0 will disable connection pooling
-  poolSize: 10,
+  max: 10,
 
   // max milliseconds a client can go unused before it is removed
   // from the pool and destroyed
-  poolIdleTimeout: 30000,
-
-  // frequency to check for idle clients within the client pool
-  reapIntervalMillis: 1000,
-
-  // if true the most recently released resources will be the first to be allocated
-  returnToHead: false,
-
-  // pool log function / boolean
-  poolLog: false,
+  idleTimeoutMillis: 30000,
 
   client_encoding: '',
 
diff --git a/test/integration/client/configuration-tests.js b/test/integration/client/configuration-tests.js
index 9d3b7f5ab..87bb52d47 100644
--- a/test/integration/client/configuration-tests.js
+++ b/test/integration/client/configuration-tests.js
@@ -18,7 +18,14 @@ suite.test('default values are used in new clients', function () {
     password: null,
     port: 5432,
     rows: 0,
-    poolSize: 10
+    max: 10,
+    binary: false,
+    idleTimeoutMillis: 30000,
+    client_encoding: '',
+    ssl: false,
+    application_name: undefined,
+    fallback_application_name: undefined,
+    parseInputDatesAsUTC: false
   })
 
   var client = new pg.Client()