From eeb62ba40da27941dad144635ee84b283950d411 Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Tue, 12 May 2020 16:41:12 -0400
Subject: [PATCH 1/5] test: Replace __dirname concatenations in require(...)
 with relative paths

Replaces __dirname concatentation in pg test scripts so that editors like
VS Code can automatically generate typings and support code navigation (F12).
---
 packages/pg/test/cli.js                                     | 2 +-
 packages/pg/test/integration/client/api-tests.js            | 2 +-
 packages/pg/test/integration/client/appname-tests.js        | 2 +-
 packages/pg/test/integration/client/array-tests.js          | 2 +-
 .../pg/test/integration/client/query-as-promise-tests.js    | 2 +-
 .../pg/test/integration/client/query-column-names-tests.js  | 2 +-
 packages/pg/test/integration/client/ssl-tests.js            | 4 ++--
 packages/pg/test/integration/client/type-coercion-tests.js  | 2 +-
 .../pg/test/integration/connection/bound-command-tests.js   | 2 +-
 packages/pg/test/integration/connection/copy-tests.js       | 2 +-
 .../pg/test/integration/connection/notification-tests.js    | 2 +-
 packages/pg/test/integration/connection/query-tests.js      | 2 +-
 packages/pg/test/integration/connection/test-helper.js      | 6 +++---
 packages/pg/test/integration/gh-issues/130-tests.js         | 2 +-
 packages/pg/test/integration/gh-issues/507-tests.js         | 2 +-
 packages/pg/test/native/stress-tests.js                     | 4 ++--
 packages/pg/test/test-buffers.js                            | 2 +-
 packages/pg/test/unit/client/configuration-tests.js         | 2 +-
 packages/pg/test/unit/client/escape-tests.js                | 2 +-
 packages/pg/test/unit/client/notification-tests.js          | 2 +-
 packages/pg/test/unit/client/query-queue-tests.js           | 4 ++--
 packages/pg/test/unit/client/result-metadata-tests.js       | 2 +-
 packages/pg/test/unit/client/simple-query-tests.js          | 2 +-
 .../unit/client/stream-and-query-error-interaction-tests.js | 6 +++---
 .../pg/test/unit/connection-parameters/creation-tests.js    | 6 +++---
 .../connection-parameters/environment-variable-tests.js     | 6 +++---
 packages/pg/test/unit/connection/error-tests.js             | 4 ++--
 packages/pg/test/unit/connection/inbound-parser-tests.js    | 6 +++---
 packages/pg/test/unit/connection/startup-tests.js           | 4 ++--
 packages/pg/test/unit/connection/test-helper.js             | 2 +-
 30 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/packages/pg/test/cli.js b/packages/pg/test/cli.js
index 2b40976c..03699b9b 100644
--- a/packages/pg/test/cli.js
+++ b/packages/pg/test/cli.js
@@ -1,5 +1,5 @@
 'use strict'
-var ConnectionParameters = require(__dirname + '/../lib/connection-parameters')
+var ConnectionParameters = require('../lib/connection-parameters')
 var config = new ConnectionParameters(process.argv[2])
 
 for (var i = 0; i < process.argv.length; i++) {
diff --git a/packages/pg/test/integration/client/api-tests.js b/packages/pg/test/integration/client/api-tests.js
index a957c32a..abaab69f 100644
--- a/packages/pg/test/integration/client/api-tests.js
+++ b/packages/pg/test/integration/client/api-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 var suite = new helper.Suite()
diff --git a/packages/pg/test/integration/client/appname-tests.js b/packages/pg/test/integration/client/appname-tests.js
index dd8de6b3..ab7202a9 100644
--- a/packages/pg/test/integration/client/appname-tests.js
+++ b/packages/pg/test/integration/client/appname-tests.js
@@ -71,7 +71,7 @@ suite.test('application_name has precedence over fallback_application_name', fun
 
 suite.test('application_name from connection string', function (done) {
   var appName = 'my app'
-  var conParams = require(__dirname + '/../../../lib/connection-parameters')
+  var conParams = require('../../../lib/connection-parameters')
   var conf
   if (process.argv[2]) {
     conf = new conParams(process.argv[2] + '?application_name=' + appName)
diff --git a/packages/pg/test/integration/client/array-tests.js b/packages/pg/test/integration/client/array-tests.js
index f5e62b03..a3213964 100644
--- a/packages/pg/test/integration/client/array-tests.js
+++ b/packages/pg/test/integration/client/array-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var pg = helper.pg
 
 var suite = new helper.Suite()
diff --git a/packages/pg/test/integration/client/query-as-promise-tests.js b/packages/pg/test/integration/client/query-as-promise-tests.js
index 46365c6c..30c106f0 100644
--- a/packages/pg/test/integration/client/query-as-promise-tests.js
+++ b/packages/pg/test/integration/client/query-as-promise-tests.js
@@ -1,6 +1,6 @@
 'use strict'
 var bluebird = require('bluebird')
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 process.on('unhandledRejection', function (e) {
diff --git a/packages/pg/test/integration/client/query-column-names-tests.js b/packages/pg/test/integration/client/query-column-names-tests.js
index 6b32881e..a109209b 100644
--- a/packages/pg/test/integration/client/query-column-names-tests.js
+++ b/packages/pg/test/integration/client/query-column-names-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 new helper.Suite().test('support for complex column names', function () {
diff --git a/packages/pg/test/integration/client/ssl-tests.js b/packages/pg/test/integration/client/ssl-tests.js
index 1d3c5015..97aa5949 100644
--- a/packages/pg/test/integration/client/ssl-tests.js
+++ b/packages/pg/test/integration/client/ssl-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var pg = require(__dirname + '/../../../lib')
-var config = require(__dirname + '/test-helper').config
+var pg = require('../../../lib')
+var config = require('./test-helper').config
 test('can connect with ssl', function () {
   return false
   config.ssl = {
diff --git a/packages/pg/test/integration/client/type-coercion-tests.js b/packages/pg/test/integration/client/type-coercion-tests.js
index 96f57b08..33249a9b 100644
--- a/packages/pg/test/integration/client/type-coercion-tests.js
+++ b/packages/pg/test/integration/client/type-coercion-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var pg = helper.pg
 var sink
 const suite = new helper.Suite()
diff --git a/packages/pg/test/integration/connection/bound-command-tests.js b/packages/pg/test/integration/connection/bound-command-tests.js
index a707bc4b..15f4f791 100644
--- a/packages/pg/test/integration/connection/bound-command-tests.js
+++ b/packages/pg/test/integration/connection/bound-command-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 // http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
 
 test('flushing once', function () {
diff --git a/packages/pg/test/integration/connection/copy-tests.js b/packages/pg/test/integration/connection/copy-tests.js
index 1b7d06ed..177009d0 100644
--- a/packages/pg/test/integration/connection/copy-tests.js
+++ b/packages/pg/test/integration/connection/copy-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var assert = require('assert')
 
 test('COPY FROM events check', function () {
diff --git a/packages/pg/test/integration/connection/notification-tests.js b/packages/pg/test/integration/connection/notification-tests.js
index 347b7ee8..534106d4 100644
--- a/packages/pg/test/integration/connection/notification-tests.js
+++ b/packages/pg/test/integration/connection/notification-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 // http://www.postgresql.org/docs/8.3/static/libpq-notify.html
 test('recieves notification from same connection with no payload', function () {
   helper.connect(function (con) {
diff --git a/packages/pg/test/integration/connection/query-tests.js b/packages/pg/test/integration/connection/query-tests.js
index 70c39c32..4105bb71 100644
--- a/packages/pg/test/integration/connection/query-tests.js
+++ b/packages/pg/test/integration/connection/query-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var assert = require('assert')
 
 var rows = []
diff --git a/packages/pg/test/integration/connection/test-helper.js b/packages/pg/test/integration/connection/test-helper.js
index ca978af4..a94c64be 100644
--- a/packages/pg/test/integration/connection/test-helper.js
+++ b/packages/pg/test/integration/connection/test-helper.js
@@ -1,8 +1,8 @@
 'use strict'
 var net = require('net')
-var helper = require(__dirname + '/../test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
-var utils = require(__dirname + '/../../../lib/utils')
+var helper = require('../test-helper')
+var Connection = require('../../../lib/connection')
+var utils = require('../../../lib/utils')
 var connect = function (callback) {
   var username = helper.args.user
   var database = helper.args.database
diff --git a/packages/pg/test/integration/gh-issues/130-tests.js b/packages/pg/test/integration/gh-issues/130-tests.js
index 8b097b99..fb86b5ba 100644
--- a/packages/pg/test/integration/gh-issues/130-tests.js
+++ b/packages/pg/test/integration/gh-issues/130-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var exec = require('child_process').exec
 
 helper.pg.defaults.poolIdleTimeout = 1000
diff --git a/packages/pg/test/integration/gh-issues/507-tests.js b/packages/pg/test/integration/gh-issues/507-tests.js
index 9c340919..f77d1f84 100644
--- a/packages/pg/test/integration/gh-issues/507-tests.js
+++ b/packages/pg/test/integration/gh-issues/507-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 new helper.Suite().test('parsing array results', function (cb) {
diff --git a/packages/pg/test/native/stress-tests.js b/packages/pg/test/native/stress-tests.js
index 49904b12..9d128775 100644
--- a/packages/pg/test/native/stress-tests.js
+++ b/packages/pg/test/native/stress-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
-var Client = require(__dirname + '/../../lib/native')
+var helper = require('../test-helper')
+var Client = require('../../lib/native')
 var Query = Client.Query
 
 test('many rows', function () {
diff --git a/packages/pg/test/test-buffers.js b/packages/pg/test/test-buffers.js
index 9fdd889d..64fefb6c 100644
--- a/packages/pg/test/test-buffers.js
+++ b/packages/pg/test/test-buffers.js
@@ -1,5 +1,5 @@
 'use strict'
-require(__dirname + '/test-helper')
+require('./test-helper')
 // http://developer.postgresql.org/pgdocs/postgres/protocol-message-formats.html
 
 var buffers = {}
diff --git a/packages/pg/test/unit/client/configuration-tests.js b/packages/pg/test/unit/client/configuration-tests.js
index e604513b..19a1da80 100644
--- a/packages/pg/test/unit/client/configuration-tests.js
+++ b/packages/pg/test/unit/client/configuration-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-require(__dirname + '/test-helper')
+require('./test-helper')
 var assert = require('assert')
 
 var pguser = process.env['PGUSER'] || process.env.USER
diff --git a/packages/pg/test/unit/client/escape-tests.js b/packages/pg/test/unit/client/escape-tests.js
index 7f96a832..721b04b4 100644
--- a/packages/pg/test/unit/client/escape-tests.js
+++ b/packages/pg/test/unit/client/escape-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 function createClient(callback) {
   var client = new Client(helper.config)
diff --git a/packages/pg/test/unit/client/notification-tests.js b/packages/pg/test/unit/client/notification-tests.js
index 5ca9df22..7143acab 100644
--- a/packages/pg/test/unit/client/notification-tests.js
+++ b/packages/pg/test/unit/client/notification-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 test('passes connection notification', function () {
   var client = helper.client()
diff --git a/packages/pg/test/unit/client/query-queue-tests.js b/packages/pg/test/unit/client/query-queue-tests.js
index 9364ce82..0b5eaa56 100644
--- a/packages/pg/test/unit/client/query-queue-tests.js
+++ b/packages/pg/test/unit/client/query-queue-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
+var helper = require('./test-helper')
+var Connection = require('../../../lib/connection')
 
 test('drain', function () {
   var con = new Connection({ stream: 'NO' })
diff --git a/packages/pg/test/unit/client/result-metadata-tests.js b/packages/pg/test/unit/client/result-metadata-tests.js
index f3e00594..a5e6542c 100644
--- a/packages/pg/test/unit/client/result-metadata-tests.js
+++ b/packages/pg/test/unit/client/result-metadata-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 
 var testForTag = function (tagText, callback) {
   test('includes command tag data for tag ' + tagText, function () {
diff --git a/packages/pg/test/unit/client/simple-query-tests.js b/packages/pg/test/unit/client/simple-query-tests.js
index b0d5b867..2c3ea5e4 100644
--- a/packages/pg/test/unit/client/simple-query-tests.js
+++ b/packages/pg/test/unit/client/simple-query-tests.js
@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var Query = require('../../../lib/query')
 
 test('executing query', 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 3f84ae4a..892d2e87 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
@@ -1,7 +1,7 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
-var Client = require(__dirname + '/../../../lib/client')
+var helper = require('./test-helper')
+var Connection = require('../../../lib/connection')
+var Client = require('../../../lib/client')
 
 test('emits end when not in query', function () {
   var stream = new (require('events').EventEmitter)()
diff --git a/packages/pg/test/unit/connection-parameters/creation-tests.js b/packages/pg/test/unit/connection-parameters/creation-tests.js
index 820b320a..5e762573 100644
--- a/packages/pg/test/unit/connection-parameters/creation-tests.js
+++ b/packages/pg/test/unit/connection-parameters/creation-tests.js
@@ -1,8 +1,8 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var assert = require('assert')
-var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters')
-var defaults = require(__dirname + '/../../../lib').defaults
+var ConnectionParameters = require('../../../lib/connection-parameters')
+var defaults = require('../../../lib').defaults
 
 // clear process.env
 for (var key in process.env) {
diff --git a/packages/pg/test/unit/connection-parameters/environment-variable-tests.js b/packages/pg/test/unit/connection-parameters/environment-variable-tests.js
index c64edee8..b20a7934 100644
--- a/packages/pg/test/unit/connection-parameters/environment-variable-tests.js
+++ b/packages/pg/test/unit/connection-parameters/environment-variable-tests.js
@@ -1,10 +1,10 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 const Suite = require('../../suite')
 
 var assert = require('assert')
-var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters')
-var defaults = require(__dirname + '/../../../lib').defaults
+var ConnectionParameters = require('../../../lib/connection-parameters')
+var defaults = require('../../../lib').defaults
 
 // clear process.env
 var realEnv = {}
diff --git a/packages/pg/test/unit/connection/error-tests.js b/packages/pg/test/unit/connection/error-tests.js
index 5075c770..b9ccd819 100644
--- a/packages/pg/test/unit/connection/error-tests.js
+++ b/packages/pg/test/unit/connection/error-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
+var helper = require('./test-helper')
+var Connection = require('../../../lib/connection')
 var net = require('net')
 
 const suite = new helper.Suite()
diff --git a/packages/pg/test/unit/connection/inbound-parser-tests.js b/packages/pg/test/unit/connection/inbound-parser-tests.js
index f3690cc6..0e3c34cf 100644
--- a/packages/pg/test/unit/connection/inbound-parser-tests.js
+++ b/packages/pg/test/unit/connection/inbound-parser-tests.js
@@ -1,7 +1,7 @@
 'use strict'
-require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
-var buffers = require(__dirname + '/../../test-buffers')
+require('./test-helper')
+var Connection = require('../../../lib/connection')
+var buffers = require('../../test-buffers')
 var PARSE = function (buffer) {
   return new Parser(buffer).parse()
 }
diff --git a/packages/pg/test/unit/connection/startup-tests.js b/packages/pg/test/unit/connection/startup-tests.js
index 6e317d70..e2eb6ee9 100644
--- a/packages/pg/test/unit/connection/startup-tests.js
+++ b/packages/pg/test/unit/connection/startup-tests.js
@@ -1,6 +1,6 @@
 'use strict'
-require(__dirname + '/test-helper')
-var Connection = require(__dirname + '/../../../lib/connection')
+require('./test-helper')
+var Connection = require('../../../lib/connection')
 test('connection can take existing stream', function () {
   var stream = new MemoryStream()
   var con = new Connection({ stream: stream })
diff --git a/packages/pg/test/unit/connection/test-helper.js b/packages/pg/test/unit/connection/test-helper.js
index 53c4b0c9..0cc83dca 100644
--- a/packages/pg/test/unit/connection/test-helper.js
+++ b/packages/pg/test/unit/connection/test-helper.js
@@ -1,2 +1,2 @@
 'use strict'
-module.exports = require(__dirname + '/../test-helper')
+module.exports = require('../test-helper')

From bd28c0f15cff48956378cc577a87bba3c4a7ee8a Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Sat, 16 May 2020 07:42:25 -0400
Subject: [PATCH 2/5] test: Remove unused getMode() function

---
 packages/pg/test/test-helper.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/pg/test/test-helper.js b/packages/pg/test/test-helper.js
index 8159e387..2d93756e 100644
--- a/packages/pg/test/test-helper.js
+++ b/packages/pg/test/test-helper.js
@@ -171,12 +171,6 @@ assert.isNull = function (item, message) {
   assert.ok(item === null, message)
 }
 
-const getMode = () => {
-  if (args.native) return 'native'
-  if (args.binary) return 'binary'
-  return ''
-}
-
 global.test = function (name, action) {
   test.testCount++
   test[name] = action

From 87559bdbfa9beca18e73bb589acffc502180b889 Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Sat, 16 May 2020 07:43:57 -0400
Subject: [PATCH 3/5] test: Remove unused count variable

Removes unused count var. Sink function below it shadows the variable within
its add(...) function so file level count variable is never used.
---
 packages/pg/test/test-helper.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/pg/test/test-helper.js b/packages/pg/test/test-helper.js
index 2d93756e..ee362500 100644
--- a/packages/pg/test/test-helper.js
+++ b/packages/pg/test/test-helper.js
@@ -197,8 +197,6 @@ process.on('uncaughtException', function (err) {
   process.exit(255)
 })
 
-var count = 0
-
 var Sink = function (expected, timeout, callback) {
   var defaultTimeout = 5000
   if (typeof timeout === 'function') {

From 02c4fc5b95d6bfd497975ae280798c923daace2a Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Sat, 16 May 2020 07:45:55 -0400
Subject: [PATCH 4/5] test: Remove unused imports in test-helpers

---
 packages/pg/test/test-helper.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/pg/test/test-helper.js b/packages/pg/test/test-helper.js
index ee362500..8156b39f 100644
--- a/packages/pg/test/test-helper.js
+++ b/packages/pg/test/test-helper.js
@@ -1,15 +1,12 @@
 'use strict'
 // make assert a global...
 global.assert = require('assert')
-var EventEmitter = require('events').EventEmitter
 var sys = require('util')
 
 var BufferList = require('./buffer-list')
 const Suite = require('./suite')
 const args = require('./cli')
 
-var Connection = require('./../lib/connection')
-
 global.Client = require('./../lib').Client
 
 process.on('uncaughtException', function (d) {

From 96e2f20a1d8da9871fbd085dd97fd3fab705bf2d Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Sat, 16 May 2020 07:58:57 -0400
Subject: [PATCH 5/5] test: Replace global BufferList with local require

Removes assigning BufferList to a global in top level test-helper and adds explicit
require in the tests that need to access it.
---
 packages/pg/test/buffer-list.js                          | 3 ++-
 packages/pg/test/test-buffers.js                         | 1 +
 packages/pg/test/test-helper.js                          | 1 -
 packages/pg/test/unit/client/md5-password-tests.js       | 1 +
 packages/pg/test/unit/connection/inbound-parser-tests.js | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/pg/test/buffer-list.js b/packages/pg/test/buffer-list.js
index aea529c1..ec48b6ad 100644
--- a/packages/pg/test/buffer-list.js
+++ b/packages/pg/test/buffer-list.js
@@ -1,5 +1,6 @@
 'use strict'
-global.BufferList = function () {
+
+const BufferList = function () {
   this.buffers = []
 }
 var p = BufferList.prototype
diff --git a/packages/pg/test/test-buffers.js b/packages/pg/test/test-buffers.js
index 64fefb6c..2989434d 100644
--- a/packages/pg/test/test-buffers.js
+++ b/packages/pg/test/test-buffers.js
@@ -1,5 +1,6 @@
 'use strict'
 require('./test-helper')
+const BufferList = require('./buffer-list')
 // http://developer.postgresql.org/pgdocs/postgres/protocol-message-formats.html
 
 var buffers = {}
diff --git a/packages/pg/test/test-helper.js b/packages/pg/test/test-helper.js
index 8156b39f..4ca9da1b 100644
--- a/packages/pg/test/test-helper.js
+++ b/packages/pg/test/test-helper.js
@@ -3,7 +3,6 @@
 global.assert = require('assert')
 var sys = require('util')
 
-var BufferList = require('./buffer-list')
 const Suite = require('./suite')
 const args = require('./cli')
 
diff --git a/packages/pg/test/unit/client/md5-password-tests.js b/packages/pg/test/unit/client/md5-password-tests.js
index a55e955b..71f50208 100644
--- a/packages/pg/test/unit/client/md5-password-tests.js
+++ b/packages/pg/test/unit/client/md5-password-tests.js
@@ -1,5 +1,6 @@
 'use strict'
 var helper = require('./test-helper')
+const BufferList = require('../../buffer-list')
 var utils = require('../../../lib/utils')
 
 test('md5 authentication', function () {
diff --git a/packages/pg/test/unit/connection/inbound-parser-tests.js b/packages/pg/test/unit/connection/inbound-parser-tests.js
index 0e3c34cf..af9385c4 100644
--- a/packages/pg/test/unit/connection/inbound-parser-tests.js
+++ b/packages/pg/test/unit/connection/inbound-parser-tests.js
@@ -1,5 +1,6 @@
 'use strict'
 require('./test-helper')
+const BufferList = require('../../buffer-list')
 var Connection = require('../../../lib/connection')
 var buffers = require('../../test-buffers')
 var PARSE = function (buffer) {