diff --git a/lib/client.js b/lib/client.js
index b11a0f39..dafa5a49 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js
index e6efa158..a675e585 100644
--- a/lib/connection-parameters.js
+++ b/lib/connection-parameters.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/connection.js b/lib/connection.js
index 8e57ff46..18aaf6f8 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/defaults.js b/lib/defaults.js
index b94d33f3..de8898ee 100644
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/index.js b/lib/index.js
index d12ea45a..ad0c7172 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/native/client.js b/lib/native/client.js
index 9641d399..9614cd14 100644
--- a/lib/native/client.js
+++ b/lib/native/client.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/native/index.js b/lib/native/index.js
index a35a2733..53f10c4a 100644
--- a/lib/native/index.js
+++ b/lib/native/index.js
@@ -1 +1,2 @@
+"use strict";
 module.exports = require('./client')
diff --git a/lib/native/query.js b/lib/native/query.js
index 4fb501f1..f9dacfa1 100644
--- a/lib/native/query.js
+++ b/lib/native/query.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/native/result.js b/lib/native/result.js
index 51903731..62075b65 100644
--- a/lib/native/result.js
+++ b/lib/native/result.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/query.js b/lib/query.js
index 99b5ea8b..e294a4f0 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/result.js b/lib/result.js
index 093a73c3..21b649a9 100644
--- a/lib/result.js
+++ b/lib/result.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/type-overrides.js b/lib/type-overrides.js
index 90526089..53be35ef 100644
--- a/lib/type-overrides.js
+++ b/lib/type-overrides.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/lib/utils.js b/lib/utils.js
index 7ecf4b29..05c6f0b4 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Copyright (c) 2010-2017 Brian Carlson (brian.m.carlson@gmail.com)
  * All rights reserved.
diff --git a/script/create-test-tables.js b/script/create-test-tables.js
index 6a569f2a..4881daf8 100644
--- a/script/create-test-tables.js
+++ b/script/create-test-tables.js
@@ -1,3 +1,4 @@
+"use strict";
 var args = require(__dirname + '/../test/cli');
 var pg = require(__dirname + '/../lib');
 
diff --git a/script/dump-db-types.js b/script/dump-db-types.js
index aa23825c..cd204153 100644
--- a/script/dump-db-types.js
+++ b/script/dump-db-types.js
@@ -1,3 +1,4 @@
+"use strict";
 var pg = require(__dirname + '/../lib');
 var args = require(__dirname + '/../test/cli');
 
diff --git a/script/list-db-types.js b/script/list-db-types.js
index 748d32f2..b2db8403 100644
--- a/script/list-db-types.js
+++ b/script/list-db-types.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/../test/integration/test-helper");
 var pg = helper.pg;
 pg.connect(helper.config, assert.success(function(client) {
diff --git a/test/buffer-list.js b/test/buffer-list.js
index 2b1ac73e..3ebffe9d 100644
--- a/test/buffer-list.js
+++ b/test/buffer-list.js
@@ -1,4 +1,5 @@
-BufferList = function() {
+"use strict";
+global.BufferList = function() {
   this.buffers = [];
 };
 var p = BufferList.prototype;
diff --git a/test/cli.js b/test/cli.js
index bec0f3fb..388b8acf 100644
--- a/test/cli.js
+++ b/test/cli.js
@@ -1,3 +1,4 @@
+"use strict";
 var ConnectionParameters = require(__dirname + '/../lib/connection-parameters');
 var config = new ConnectionParameters(process.argv[2]);
 
diff --git a/test/integration/client/api-tests.js b/test/integration/client/api-tests.js
index 5f999482..e51a363a 100644
--- a/test/integration/client/api-tests.js
+++ b/test/integration/client/api-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/../test-helper");
 var pg = helper.pg;
 
diff --git a/test/integration/client/appname-tests.js b/test/integration/client/appname-tests.js
index 55673eff..98c41776 100644
--- a/test/integration/client/appname-tests.js
+++ b/test/integration/client/appname-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 var Client = helper.Client;
 
diff --git a/test/integration/client/array-tests.js b/test/integration/client/array-tests.js
index a26c7636..e56b5e63 100644
--- a/test/integration/client/array-tests.js
+++ b/test/integration/client/array-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/test-helper");
 var pg = helper.pg;
 
diff --git a/test/integration/client/big-simple-query-tests.js b/test/integration/client/big-simple-query-tests.js
index 0065772c..7db183f4 100644
--- a/test/integration/client/big-simple-query-tests.js
+++ b/test/integration/client/big-simple-query-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./test-helper");
 var Query = helper.pg.Query
 
diff --git a/test/integration/client/configuration-tests.js b/test/integration/client/configuration-tests.js
index 8cde4cea..8bd065e9 100644
--- a/test/integration/client/configuration-tests.js
+++ b/test/integration/client/configuration-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 var pg = helper.pg;
 
diff --git a/test/integration/client/custom-types-tests.js b/test/integration/client/custom-types-tests.js
index 9305dbbd..db143356 100644
--- a/test/integration/client/custom-types-tests.js
+++ b/test/integration/client/custom-types-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 const helper = require('./test-helper');
 const Client = helper.pg.Client;
 const suite = new helper.Suite()
diff --git a/test/integration/client/empty-query-tests.js b/test/integration/client/empty-query-tests.js
index 8251088a..443c37d6 100644
--- a/test/integration/client/empty-query-tests.js
+++ b/test/integration/client/empty-query-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 const suite = new helper.Suite()
 
diff --git a/test/integration/client/error-handling-tests.js b/test/integration/client/error-handling-tests.js
index 69d43085..32ee58ba 100644
--- a/test/integration/client/error-handling-tests.js
+++ b/test/integration/client/error-handling-tests.js
@@ -1,4 +1,5 @@
 "use strict";
+"use strict";
 
 var helper = require('./test-helper');
 var util = require('util');
diff --git a/test/integration/client/huge-numeric-tests.js b/test/integration/client/huge-numeric-tests.js
index 9cd90537..a5bdbc8a 100644
--- a/test/integration/client/huge-numeric-tests.js
+++ b/test/integration/client/huge-numeric-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 const pool = new helper.pg.Pool()
 
diff --git a/test/integration/client/json-type-parsing-tests.js b/test/integration/client/json-type-parsing-tests.js
index b3ec4074..77c5469a 100644
--- a/test/integration/client/json-type-parsing-tests.js
+++ b/test/integration/client/json-type-parsing-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 var assert = require('assert');
 
diff --git a/test/integration/client/network-partition-tests.js b/test/integration/client/network-partition-tests.js
index 8e9d8af8..704f7fdf 100644
--- a/test/integration/client/network-partition-tests.js
+++ b/test/integration/client/network-partition-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var buffers = require('../../test-buffers')
 var helper = require('./test-helper')
 var suite = new helper.Suite()
diff --git a/test/integration/client/no-data-tests.js b/test/integration/client/no-data-tests.js
index 28a4999a..a4ab36fb 100644
--- a/test/integration/client/no-data-tests.js
+++ b/test/integration/client/no-data-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 const suite = new helper.Suite()
 
diff --git a/test/integration/client/no-row-result-tests.js b/test/integration/client/no-row-result-tests.js
index cc91c647..4ff28995 100644
--- a/test/integration/client/no-row-result-tests.js
+++ b/test/integration/client/no-row-result-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./test-helper");
 var pg = helper.pg;
 const suite = new helper.Suite();
diff --git a/test/integration/client/notice-tests.js b/test/integration/client/notice-tests.js
index f226de8f..9c682050 100644
--- a/test/integration/client/notice-tests.js
+++ b/test/integration/client/notice-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 const suite = new helper.Suite()
 
diff --git a/test/integration/client/parse-int-8-tests.js b/test/integration/client/parse-int-8-tests.js
index 937b41b7..920f5558 100644
--- a/test/integration/client/parse-int-8-tests.js
+++ b/test/integration/client/parse-int-8-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 
 var helper = require('../test-helper');
 var pg = helper.pg;
diff --git a/test/integration/client/prepared-statement-tests.js b/test/integration/client/prepared-statement-tests.js
index 0d037b00..9b00f9d8 100644
--- a/test/integration/client/prepared-statement-tests.js
+++ b/test/integration/client/prepared-statement-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 var Query = helper.pg.Query;
 
diff --git a/test/integration/client/promise-api-tests.js b/test/integration/client/promise-api-tests.js
index ee088f94..45083a1b 100644
--- a/test/integration/client/promise-api-tests.js
+++ b/test/integration/client/promise-api-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 'use strict';
 
 const helper = require('./test-helper')
diff --git a/test/integration/client/query-as-promise-tests.js b/test/integration/client/query-as-promise-tests.js
index 95bf73ce..52487a7d 100644
--- a/test/integration/client/query-as-promise-tests.js
+++ b/test/integration/client/query-as-promise-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/../test-helper');
 var pg = helper.pg;
 
diff --git a/test/integration/client/query-column-names-tests.js b/test/integration/client/query-column-names-tests.js
index d929b508..a670bae3 100644
--- a/test/integration/client/query-column-names-tests.js
+++ b/test/integration/client/query-column-names-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/../test-helper');
 var pg = helper.pg;
 
diff --git a/test/integration/client/query-error-handling-prepared-statement-tests.js b/test/integration/client/query-error-handling-prepared-statement-tests.js
index 7aa68f59..f16f96f6 100644
--- a/test/integration/client/query-error-handling-prepared-statement-tests.js
+++ b/test/integration/client/query-error-handling-prepared-statement-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 var Query = helper.pg.Query;
 var util = require('util');
diff --git a/test/integration/client/query-error-handling-tests.js b/test/integration/client/query-error-handling-tests.js
index d5ecd7bd..6c1b3b7c 100644
--- a/test/integration/client/query-error-handling-tests.js
+++ b/test/integration/client/query-error-handling-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 var util = require('util');
 var Query = helper.pg.Query;
diff --git a/test/integration/client/quick-disconnect-tests.js b/test/integration/client/quick-disconnect-tests.js
index a1b6bab6..76a825ac 100644
--- a/test/integration/client/quick-disconnect-tests.js
+++ b/test/integration/client/quick-disconnect-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 //test for issue #320
 //
 var helper = require('./test-helper');
diff --git a/test/integration/client/result-metadata-tests.js b/test/integration/client/result-metadata-tests.js
index 85b7e18c..bb7aeff7 100644
--- a/test/integration/client/result-metadata-tests.js
+++ b/test/integration/client/result-metadata-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./test-helper");
 var pg = helper.pg;
 
diff --git a/test/integration/client/results-as-array-tests.js b/test/integration/client/results-as-array-tests.js
index 1a1d8edf..45398c05 100644
--- a/test/integration/client/results-as-array-tests.js
+++ b/test/integration/client/results-as-array-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var util = require('util');
 var helper = require('./test-helper');
 
diff --git a/test/integration/client/row-description-on-results-tests.js b/test/integration/client/row-description-on-results-tests.js
index 22c92965..3d146bd6 100644
--- a/test/integration/client/row-description-on-results-tests.js
+++ b/test/integration/client/row-description-on-results-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 
 var Client = helper.Client;
diff --git a/test/integration/client/simple-query-tests.js b/test/integration/client/simple-query-tests.js
index 9453f159..6ae957dc 100644
--- a/test/integration/client/simple-query-tests.js
+++ b/test/integration/client/simple-query-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./test-helper");
 var Query = helper.pg.Query;
 
@@ -18,7 +19,7 @@ test("simple query interface", function() {
   query.once('row', function(row) {
     test('Can iterate through columns', function () {
       var columnCount = 0;
-      for (column in row) {
+      for (var column in row) {
         columnCount++;
       }
       if ('length' in row) {
diff --git a/test/integration/client/ssl-tests.js b/test/integration/client/ssl-tests.js
index 0458d6b0..7523dfd3 100644
--- a/test/integration/client/ssl-tests.js
+++ b/test/integration/client/ssl-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var pg = require(__dirname + '/../../../lib');
 var config = require(__dirname + '/test-helper').config;
 test('can connect with ssl', function() {
diff --git a/test/integration/client/test-helper.js b/test/integration/client/test-helper.js
index 24cddf61..027477a1 100644
--- a/test/integration/client/test-helper.js
+++ b/test/integration/client/test-helper.js
@@ -1,3 +1,4 @@
-var helper = require(__dirname+'/../test-helper');
+"use strict";
+var helper = require('./../test-helper');
 
 module.exports = helper;
diff --git a/test/integration/client/timezone-tests.js b/test/integration/client/timezone-tests.js
index 29873431..c1baa798 100644
--- a/test/integration/client/timezone-tests.js
+++ b/test/integration/client/timezone-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./../test-helper');
 var exec = require('child_process').exec;
 
diff --git a/test/integration/client/transaction-tests.js b/test/integration/client/transaction-tests.js
index 389a70d0..c9af7eab 100644
--- a/test/integration/client/transaction-tests.js
+++ b/test/integration/client/transaction-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 const suite = new helper.Suite()
 const pg = helper.pg
diff --git a/test/integration/client/type-coercion-tests.js b/test/integration/client/type-coercion-tests.js
index dc50732e..080dd9ad 100644
--- a/test/integration/client/type-coercion-tests.js
+++ b/test/integration/client/type-coercion-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 var pg = helper.pg;
 var sink;
diff --git a/test/integration/client/type-parser-override-tests.js b/test/integration/client/type-parser-override-tests.js
index 3fd52dd2..f12e4005 100644
--- a/test/integration/client/type-parser-override-tests.js
+++ b/test/integration/client/type-parser-override-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 
 function testTypeParser(client, expectedResult, done) {
diff --git a/test/integration/connection-pool/connection-pool-size-tests.js b/test/integration/connection-pool/connection-pool-size-tests.js
index 998bff7e..51051c24 100644
--- a/test/integration/connection-pool/connection-pool-size-tests.js
+++ b/test/integration/connection-pool/connection-pool-size-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./test-helper")
 
 helper.testPoolSize(1);
diff --git a/test/integration/connection-pool/error-tests.js b/test/integration/connection-pool/error-tests.js
index 21f61531..e01d598f 100644
--- a/test/integration/connection-pool/error-tests.js
+++ b/test/integration/connection-pool/error-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./test-helper");
 const pg = helper.pg
 
diff --git a/test/integration/connection-pool/idle-timeout-tests.js b/test/integration/connection-pool/idle-timeout-tests.js
index e8090a09..0531ae80 100644
--- a/test/integration/connection-pool/idle-timeout-tests.js
+++ b/test/integration/connection-pool/idle-timeout-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 
 
diff --git a/test/integration/connection-pool/native-instance-tests.js b/test/integration/connection-pool/native-instance-tests.js
index 314920c4..caaa2b67 100644
--- a/test/integration/connection-pool/native-instance-tests.js
+++ b/test/integration/connection-pool/native-instance-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./../test-helper")
 var pg = helper.pg
 var native = helper.args.native
diff --git a/test/integration/connection-pool/test-helper.js b/test/integration/connection-pool/test-helper.js
index b66bcba5..85ecd899 100644
--- a/test/integration/connection-pool/test-helper.js
+++ b/test/integration/connection-pool/test-helper.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./../test-helper");
 
 const suite = new helper.Suite()
diff --git a/test/integration/connection-pool/yield-support-tests.js b/test/integration/connection-pool/yield-support-tests.js
index c56d9851..14926699 100644
--- a/test/integration/connection-pool/yield-support-tests.js
+++ b/test/integration/connection-pool/yield-support-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper')
 var co = require('co')
 
diff --git a/test/integration/connection/bound-command-tests.js b/test/integration/connection/bound-command-tests.js
index 9d40e5bc..40da4b5a 100644
--- a/test/integration/connection/bound-command-tests.js
+++ b/test/integration/connection/bound-command-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 //http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
 
diff --git a/test/integration/connection/copy-tests.js b/test/integration/connection/copy-tests.js
index ee4a71c5..2dfbc607 100644
--- a/test/integration/connection/copy-tests.js
+++ b/test/integration/connection/copy-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname+"/test-helper");
 var assert = require('assert');
 
diff --git a/test/integration/connection/notification-tests.js b/test/integration/connection/notification-tests.js
index e0cf1382..dd11904d 100644
--- a/test/integration/connection/notification-tests.js
+++ b/test/integration/connection/notification-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 //http://www.postgresql.org/docs/8.3/static/libpq-notify.html
 test('recieves notification from same connection with no payload', function() {
diff --git a/test/integration/connection/query-tests.js b/test/integration/connection/query-tests.js
index f308546d..6216c55a 100644
--- a/test/integration/connection/query-tests.js
+++ b/test/integration/connection/query-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname+"/test-helper");
 var assert = require('assert');
 
diff --git a/test/integration/connection/test-helper.js b/test/integration/connection/test-helper.js
index 0bc65046..d053e39a 100644
--- a/test/integration/connection/test-helper.js
+++ b/test/integration/connection/test-helper.js
@@ -1,3 +1,4 @@
+"use strict";
 var net = require('net');
 var helper = require(__dirname+'/../test-helper');
 var Connection = require(__dirname + '/../../../lib/connection');
diff --git a/test/integration/domain-tests.js b/test/integration/domain-tests.js
index ce87335e..5d4db53c 100644
--- a/test/integration/domain-tests.js
+++ b/test/integration/domain-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var async = require('async')
 
 var helper = require('./test-helper')
diff --git a/test/integration/gh-issues/130-tests.js b/test/integration/gh-issues/130-tests.js
index 0fed550b..bc1f3b74 100644
--- a/test/integration/gh-issues/130-tests.js
+++ b/test/integration/gh-issues/130-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/../test-helper');
 var exec = require('child_process').exec;
 
diff --git a/test/integration/gh-issues/131-tests.js b/test/integration/gh-issues/131-tests.js
index 41e71b5c..164f94e9 100644
--- a/test/integration/gh-issues/131-tests.js
+++ b/test/integration/gh-issues/131-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('../test-helper');
 var pg = helper.pg;
 
diff --git a/test/integration/gh-issues/199-tests.js b/test/integration/gh-issues/199-tests.js
index b60477fd..60637fb1 100644
--- a/test/integration/gh-issues/199-tests.js
+++ b/test/integration/gh-issues/199-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('../test-helper');
 var client = helper.client();
 
diff --git a/test/integration/gh-issues/507-tests.js b/test/integration/gh-issues/507-tests.js
index 57e0f769..62bec47c 100644
--- a/test/integration/gh-issues/507-tests.js
+++ b/test/integration/gh-issues/507-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/../test-helper");
 var pg = helper.pg;
 
diff --git a/test/integration/gh-issues/600-tests.js b/test/integration/gh-issues/600-tests.js
index b64f19fa..263e48d0 100644
--- a/test/integration/gh-issues/600-tests.js
+++ b/test/integration/gh-issues/600-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var async = require('async');
 var helper = require('../test-helper');
 const suite = new helper.Suite()
diff --git a/test/integration/gh-issues/675-tests.js b/test/integration/gh-issues/675-tests.js
index e1bc0a55..b162b9df 100644
--- a/test/integration/gh-issues/675-tests.js
+++ b/test/integration/gh-issues/675-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('../test-helper');
 var assert = require('assert');
 
diff --git a/test/integration/gh-issues/699-tests.js b/test/integration/gh-issues/699-tests.js
index 6f47ffca..d4c9eab7 100644
--- a/test/integration/gh-issues/699-tests.js
+++ b/test/integration/gh-issues/699-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('../test-helper');
 var assert = require('assert');
 var copyFrom = require('pg-copy-streams').from;
diff --git a/test/integration/gh-issues/787-tests.js b/test/integration/gh-issues/787-tests.js
index 773a033d..83ea85f3 100644
--- a/test/integration/gh-issues/787-tests.js
+++ b/test/integration/gh-issues/787-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('../test-helper');
 const pool = new helper.pg.Pool()
 
diff --git a/test/integration/gh-issues/882-tests.js b/test/integration/gh-issues/882-tests.js
index 1818b0c6..154f9e96 100644
--- a/test/integration/gh-issues/882-tests.js
+++ b/test/integration/gh-issues/882-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 //client should not hang on an empty query
 var helper = require('../test-helper');
 var client = helper.client();
diff --git a/test/integration/gh-issues/981-tests.js b/test/integration/gh-issues/981-tests.js
index 4ba2f5ad..6348d05a 100644
--- a/test/integration/gh-issues/981-tests.js
+++ b/test/integration/gh-issues/981-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./../test-helper');
 
 //native bindings are only installed for native tests
diff --git a/test/integration/test-helper.js b/test/integration/test-helper.js
index ceed87d5..9dba636d 100644
--- a/test/integration/test-helper.js
+++ b/test/integration/test-helper.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/../test-helper');
 
 if(helper.args.native) {
diff --git a/test/native/callback-api-tests.js b/test/native/callback-api-tests.js
index 6193ba74..fa57dbde 100644
--- a/test/native/callback-api-tests.js
+++ b/test/native/callback-api-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var domain = require('domain');
 var helper = require("./../test-helper");
 var Client = require("./../../lib/native");
diff --git a/test/native/error-tests.js b/test/native/error-tests.js
index 2edf3421..a6f87644 100644
--- a/test/native/error-tests.js
+++ b/test/native/error-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/../test-helper");
 var Client = require(__dirname + "/../../lib/native");
 
diff --git a/test/native/evented-api-tests.js b/test/native/evented-api-tests.js
index 122dc47e..8a7c19b4 100644
--- a/test/native/evented-api-tests.js
+++ b/test/native/evented-api-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("../test-helper");
 var Client = require("../../lib/native");
 var Query = Client.Query;
diff --git a/test/native/missing-native.js b/test/native/missing-native.js
index 775c6186..d8474287 100644
--- a/test/native/missing-native.js
+++ b/test/native/missing-native.js
@@ -1,3 +1,4 @@
+"use strict";
 //this test assumes it has been run from the Makefile
 //and that node_modules/pg-native has been deleted
 
diff --git a/test/native/native-vs-js-error-tests.js b/test/native/native-vs-js-error-tests.js
index ee192ddc..59c6bb94 100644
--- a/test/native/native-vs-js-error-tests.js
+++ b/test/native/native-vs-js-error-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var assert = require('assert')
 var Client = require('../../lib/client');
 var NativeClient = require('../../lib/native');
diff --git a/test/native/stress-tests.js b/test/native/stress-tests.js
index 08fab97e..32477cb8 100644
--- a/test/native/stress-tests.js
+++ b/test/native/stress-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/../test-helper");
 var Client = require(__dirname + "/../../lib/native");
 var Query = Client.Query;
diff --git a/test/suite.js b/test/suite.js
index 22d1a9cc..da6492fb 100644
--- a/test/suite.js
+++ b/test/suite.js
@@ -1,3 +1,4 @@
+"use strict";
 'use strict';
 
 const async = require('async')
diff --git a/test/test-buffers.js b/test/test-buffers.js
index b16a7ab6..0351559a 100644
--- a/test/test-buffers.js
+++ b/test/test-buffers.js
@@ -1,3 +1,4 @@
+"use strict";
 require(__dirname+'/test-helper');
 //http://developer.postgresql.org/pgdocs/postgres/protocol-message-formats.html
 
diff --git a/test/test-helper.js b/test/test-helper.js
index 802d19c0..3bfc5177 100644
--- a/test/test-helper.js
+++ b/test/test-helper.js
@@ -1,5 +1,6 @@
+"use strict";
 //make assert a global...
-assert = require('assert');
+global.assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var sys = require('util');
 
@@ -9,7 +10,7 @@ const args = require('./cli');
 
 var Connection = require('./../lib/connection');
 
-Client = require('./../lib').Client;
+global.Client = require('./../lib').Client;
 
 process.on('uncaughtException', function(d) {
   if ('stack' in d && 'message' in d) {
@@ -172,7 +173,7 @@ const getMode = () => {
   return ''
 }
 
-test = function(name, action) {
+global.test = function(name, action) {
   test.testCount ++;
   test[name] = action;
   var result = test[name]();
diff --git a/test/unit/client/cleartext-password-tests.js b/test/unit/client/cleartext-password-tests.js
index e880908b..67e7c67b 100644
--- a/test/unit/client/cleartext-password-tests.js
+++ b/test/unit/client/cleartext-password-tests.js
@@ -1,4 +1,6 @@
-require(__dirname+'/test-helper');
+"use strict";
+
+const createClient = require('./test-helper').createClient;
 
 /*
  * TODO: Add _some_ comments to explain what it is we're testing, and how the
diff --git a/test/unit/client/configuration-tests.js b/test/unit/client/configuration-tests.js
index 5548e5fb..bf007ee7 100644
--- a/test/unit/client/configuration-tests.js
+++ b/test/unit/client/configuration-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 require(__dirname+'/test-helper');
 
 var pguser = process.env['PGUSER'] || process.env.USER;
diff --git a/test/unit/client/early-disconnect-tests.js b/test/unit/client/early-disconnect-tests.js
index a4c38be9..f3884c7b 100644
--- a/test/unit/client/early-disconnect-tests.js
+++ b/test/unit/client/early-disconnect-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 var net = require('net');
 var pg = require('../../..//lib/index.js');
diff --git a/test/unit/client/escape-tests.js b/test/unit/client/escape-tests.js
index e3f638ac..7ea640fc 100644
--- a/test/unit/client/escape-tests.js
+++ b/test/unit/client/escape-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 
 function createClient(callback) {
diff --git a/test/unit/client/md5-password-tests.js b/test/unit/client/md5-password-tests.js
index 78c82602..63a0398d 100644
--- a/test/unit/client/md5-password-tests.js
+++ b/test/unit/client/md5-password-tests.js
@@ -1,8 +1,9 @@
-require('./test-helper');
+"use strict";
+var helper = require('./test-helper');
 var utils = require('../../../lib/utils')
 
 test('md5 authentication', function() {
-  var client = createClient();
+  var client = helper.createClient();
   client.password = "!";
   var salt = Buffer.from([1, 2, 3, 4]);
   client.connection.emit('authenticationMD5Password', {salt: salt});
diff --git a/test/unit/client/notification-tests.js b/test/unit/client/notification-tests.js
index e6b0dff1..dab8f608 100644
--- a/test/unit/client/notification-tests.js
+++ b/test/unit/client/notification-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/test-helper");
 
 test('passes connection notification', function() {
diff --git a/test/unit/client/prepared-statement-tests.js b/test/unit/client/prepared-statement-tests.js
index 460cbf95..50327bf4 100644
--- a/test/unit/client/prepared-statement-tests.js
+++ b/test/unit/client/prepared-statement-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('./test-helper');
 var Query = require('../../../lib/query')
 
diff --git a/test/unit/client/query-queue-tests.js b/test/unit/client/query-queue-tests.js
index 62b38bd5..2aa3b6b0 100644
--- a/test/unit/client/query-queue-tests.js
+++ b/test/unit/client/query-queue-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 var Connection = require(__dirname + '/../../../lib/connection');
 
diff --git a/test/unit/client/result-metadata-tests.js b/test/unit/client/result-metadata-tests.js
index 5f349b57..c3f26620 100644
--- a/test/unit/client/result-metadata-tests.js
+++ b/test/unit/client/result-metadata-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/test-helper")
 
 var testForTag = function(tagText, callback) {
diff --git a/test/unit/client/simple-query-tests.js b/test/unit/client/simple-query-tests.js
index df71faed..29ab0012 100644
--- a/test/unit/client/simple-query-tests.js
+++ b/test/unit/client/simple-query-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + "/test-helper");
 var Query = require('../../../lib/query')
 
diff --git a/test/unit/client/stream-and-query-error-interaction-tests.js b/test/unit/client/stream-and-query-error-interaction-tests.js
index a60e1f73..0815fccd 100644
--- a/test/unit/client/stream-and-query-error-interaction-tests.js
+++ b/test/unit/client/stream-and-query-error-interaction-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 var Connection = require(__dirname + '/../../../lib/connection');
 var Client = require(__dirname + '/../../../lib/client');
diff --git a/test/unit/client/test-helper.js b/test/unit/client/test-helper.js
index 7c0bb31b..fe1765d6 100644
--- a/test/unit/client/test-helper.js
+++ b/test/unit/client/test-helper.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require('../test-helper');
 var Connection = require('../../../lib/connection');
 
diff --git a/test/unit/client/throw-in-type-parser-tests.js b/test/unit/client/throw-in-type-parser-tests.js
index 2f184543..06580eb0 100644
--- a/test/unit/client/throw-in-type-parser-tests.js
+++ b/test/unit/client/throw-in-type-parser-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require("./test-helper");
 var Query = require("../../../lib/query");
 var types = require("pg-types");
diff --git a/test/unit/connection-parameters/creation-tests.js b/test/unit/connection-parameters/creation-tests.js
index 85c2bd03..36e17a93 100644
--- a/test/unit/connection-parameters/creation-tests.js
+++ b/test/unit/connection-parameters/creation-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/../test-helper');
 var assert = require('assert');
 var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters');
@@ -67,12 +68,12 @@ test('ConnectionParameters initializing from config', function() {
 });
 
 test('escape spaces if present', function() {
-  subject = new ConnectionParameters('postgres://localhost/post gres');
+  var subject = new ConnectionParameters('postgres://localhost/post gres');
   assert.equal(subject.database, 'post gres');
 });
 
 test('do not double escape spaces', function() {
-  subject = new ConnectionParameters('postgres://localhost/post%20gres');
+  var subject = new ConnectionParameters('postgres://localhost/post%20gres');
   assert.equal(subject.database, 'post gres');
 });
 
diff --git a/test/unit/connection-parameters/environment-variable-tests.js b/test/unit/connection-parameters/environment-variable-tests.js
index 5481915f..2f41fecd 100644
--- a/test/unit/connection-parameters/environment-variable-tests.js
+++ b/test/unit/connection-parameters/environment-variable-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/../test-helper');
 var assert = require('assert');
 var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters');
diff --git a/test/unit/connection/error-tests.js b/test/unit/connection/error-tests.js
index 98eb20a8..20952a69 100644
--- a/test/unit/connection/error-tests.js
+++ b/test/unit/connection/error-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 var helper = require(__dirname + '/test-helper');
 var Connection = require(__dirname + '/../../../lib/connection');
 test("connection emits stream errors", function() {
diff --git a/test/unit/connection/inbound-parser-tests.js b/test/unit/connection/inbound-parser-tests.js
index 2b822e44..86266b22 100644
--- a/test/unit/connection/inbound-parser-tests.js
+++ b/test/unit/connection/inbound-parser-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 require(__dirname+'/test-helper');
 var Connection = require(__dirname + '/../../../lib/connection');
 var buffers = require(__dirname + '/../../test-buffers');
diff --git a/test/unit/connection/outbound-sending-tests.js b/test/unit/connection/outbound-sending-tests.js
index 353c073b..69642957 100644
--- a/test/unit/connection/outbound-sending-tests.js
+++ b/test/unit/connection/outbound-sending-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 require(__dirname + "/test-helper");
 var Connection = require(__dirname + '/../../../lib/connection');
 var stream = new MemoryStream();
diff --git a/test/unit/connection/startup-tests.js b/test/unit/connection/startup-tests.js
index 622f4737..ee20d679 100644
--- a/test/unit/connection/startup-tests.js
+++ b/test/unit/connection/startup-tests.js
@@ -1,3 +1,4 @@
+"use strict";
 require(__dirname+'/test-helper');
 var Connection = require(__dirname + '/../../../lib/connection');
 test('connection can take existing stream', function() {
diff --git a/test/unit/connection/test-helper.js b/test/unit/connection/test-helper.js
index 88cced6d..03d95a69 100644
--- a/test/unit/connection/test-helper.js
+++ b/test/unit/connection/test-helper.js
@@ -1 +1,2 @@
+"use strict";
 require(__dirname+'/../test-helper')
diff --git a/test/unit/test-helper.js b/test/unit/test-helper.js
index ad6485be..1dcac733 100644
--- a/test/unit/test-helper.js
+++ b/test/unit/test-helper.js
@@ -1,9 +1,10 @@
+"use strict";
 var EventEmitter = require('events').EventEmitter;
 
 var helper = require('../test-helper');
 var Connection = require('../../lib/connection');
 
-MemoryStream = function() {
+global.MemoryStream = function() {
   EventEmitter.call(this);
   this.packets = [];
 };
@@ -21,7 +22,7 @@ p.setKeepAlive = function(){};
 
 p.writable = true;
 
-createClient = function() {
+const createClient = function() {
   var stream = new MemoryStream();
   stream.readyState = "open";
   var client = new Client({
@@ -31,4 +32,6 @@ createClient = function() {
   return client;
 };
 
-module.exports = helper;
+module.exports = Object.assign({}, helper, {
+  createClient: createClient,
+});
diff --git a/test/unit/utils-tests.js b/test/unit/utils-tests.js
index 82b11715..893cf5b5 100644
--- a/test/unit/utils-tests.js
+++ b/test/unit/utils-tests.js
@@ -1,6 +1,7 @@
-var helper = require(__dirname + '/test-helper');
-var utils = require(__dirname + "/../../lib/utils");
-var defaults = require(__dirname + "/../../lib").defaults;
+"use strict";
+var helper = require('./test-helper');
+var utils = require("./../../lib/utils");
+var defaults = require("./../../lib").defaults;
 
 
 test('ensure types is exported on root object', function() {