diff --git a/.gitignore b/.gitignore
index f212ad9..97fd1c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,7 @@ node_modules
 
 # Babel-compiled files
 lib
+
+# Ignore package manager lock files
+package-lock.json
+yarn.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca69bed..a3d5c0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,11 +13,12 @@ This is a major release. Check [our upgrade guide](https://github.com/bitinn/nod
 
 - Major: Node.js 0.10.x and 0.12.x support is dropped
 - Major: `require('node-fetch/lib/response')` etc. is now unsupported; use `require('node-fetch').Response` or ES6 module imports
-- Enhance: start testing on Node.js 4, 6, 7
+- Enhance: start testing on Node.js 4, 6, 8 LTS
 - Enhance: use Rollup to produce a distributed bundle (less memory overhead and faster startup)
 - Enhance: make `Object.prototype.toString()` on Headers, Requests, and Responses return correct class strings
 - Other: rewrite in ES2015 using Babel
 - Other: use Codecov for code coverage tracking
+- Other: update package.json script for npm 5
 
 ### HTTP requests
 
diff --git a/package.json b/package.json
index 1c0aa79..c79115e 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "build": "cross-env BABEL_ENV=rollup rollup -c",
-    "prepublish": "npm run build",
+    "prepare": "npm run build",
     "test": "cross-env BABEL_ENV=test mocha --compilers js:babel-register test/test.js",
     "report": "cross-env BABEL_ENV=coverage nyc --reporter lcov --reporter text mocha -R spec test/test.js",
     "coverage": "cross-env BABEL_ENV=coverage nyc --reporter json --reporter text mocha -R spec test/test.js && codecov -f coverage/coverage-final.json"
diff --git a/test/server.js b/test/server.js
index ce392f7..6f331f8 100644
--- a/test/server.js
+++ b/test/server.js
@@ -10,6 +10,9 @@ export default class TestServer {
 		this.server = http.createServer(this.router);
 		this.port = 30001;
 		this.hostname = 'localhost';
+		// node 8 default keepalive timeout is 5000ms
+		// make it shorter here as we want to close server quickly at the end of tests
+		this.server.keepAliveTimeout = 1000;
 		this.server.on('error', function(err) {
 			console.log(err.stack);
 		});