diff --git a/packages/pg/lib/connection.js b/packages/pg/lib/connection.js
index bce18348..98b6b5a5 100644
--- a/packages/pg/lib/connection.js
+++ b/packages/pg/lib/connection.js
@@ -39,6 +39,7 @@ Connection.prototype.connect = function (port, host) {
   var self = this
 
   this._connecting = true
+  this.stream.setNoDelay(true)
   this.stream.connect(port, host)
 
   this.stream.once('connect', function () {
diff --git a/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js b/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js
index 041af010..3f84ae4a 100644
--- a/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js
+++ b/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js
@@ -5,6 +5,7 @@ var Client = require(__dirname + '/../../../lib/client')
 
 test('emits end when not in query', function () {
   var stream = new (require('events').EventEmitter)()
+  stream.setNoDelay = () => {}
   stream.connect = function () {
     // NOOP
   }
diff --git a/packages/pg/test/unit/test-helper.js b/packages/pg/test/unit/test-helper.js
index 918b1418..407dbf24 100644
--- a/packages/pg/test/unit/test-helper.js
+++ b/packages/pg/test/unit/test-helper.js
@@ -17,6 +17,8 @@ p.connect = function () {
   // NOOP
 }
 
+p.setNoDelay = () => {}
+
 p.write = function (packet, cb) {
   this.packets.push(packet)
   if (cb) {