diff --git a/.travis.yml b/.travis.yml
index 9b206e7..2ae9d62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: node_js
 node_js:
+  - '10'
+  - '8'
   - '6'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa5a140..aa63b00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # HTTP Parser
 
+## 0.5.1
+
+Add TravisCI Nodejs 10 and 8.
+Improved/fixed unit tests for running on Node.js 10.
+
 ## 0.4.4
 
 Made 'maxHeaderSize' configurable.
@@ -11,4 +16,4 @@ require('http-parser-js').HTTPParser.maxHeaderSize = 1024 * 1024; // 1MB instead
 
 var http = require('http');
 // ...
-```
\ No newline at end of file
+```
diff --git a/tests/parallel/test-http-invalid-urls.js b/tests/parallel/test-http-invalid-urls.js
index 678e8ec..e305130 100644
--- a/tests/parallel/test-http-invalid-urls.js
+++ b/tests/parallel/test-http-invalid-urls.js
@@ -11,7 +11,7 @@ function test(host) {
     [http, https].forEach((module) => {
       assert.throws(() => module[method](host, () => {
         throw new Error(`${module}.${method} should not connect to ${host}`);
-      }), error);
+      }), error + " " + host);
     });
   });
 }
diff --git a/tests/parallel/test-http-request-end-twice.js b/tests/parallel/test-http-request-end-twice.js
index fe08ae2..0030faf 100644
--- a/tests/parallel/test-http-request-end-twice.js
+++ b/tests/parallel/test-http-request-end-twice.js
@@ -10,7 +10,7 @@ var server = http.Server(function(req, res) {
 server.listen(0, function() {
   var req = http.get({port: this.address().port}, function(res) {
     res.on('end', function() {
-      assert.ok(!req.end());
+      assert.ok(process.version.startsWith("v10.") ? req.end() : !req.end());
       server.close();
     });
     res.resume();
diff --git a/tests/parallel/test-http-server-multiheaders2.js b/tests/parallel/test-http-server-multiheaders2.js
index b019df8..1539da0 100644
--- a/tests/parallel/test-http-server-multiheaders2.js
+++ b/tests/parallel/test-http-server-multiheaders2.js
@@ -54,7 +54,8 @@ var srv = http.createServer(function(req, res) {
                  'foo', 'header parsed incorrectly: ' + header);
   });
   multipleAllowed.forEach(function(header) {
-    const sep = (process.version < 'v8.0') ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
+    const sep = (parseInt(process.versions.node[0] + "" + process.versions.node[1]) < 8) ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
+
     assert.strictEqual(req.headers[header.toLowerCase()], `foo${sep}bar`,
                        `header parsed incorrectly: ${header}`);
   });
diff --git a/tests/parallel/test-http-unix-socket.js b/tests/parallel/test-http-unix-socket.js
index bdac056..8f81117 100644
--- a/tests/parallel/test-http-unix-socket.js
+++ b/tests/parallel/test-http-unix-socket.js
@@ -46,7 +46,7 @@ server.listen(common.PIPE, function() {
       server.close(function(error) {
         assert.equal(error, undefined);
         server.close(function(error) {
-          assert.equal(error && error.message, 'Not running');
+          assert.equal(error && error.message, process.version.startsWith("v10.") ? "Server is not running." : 'Not running');
         });
       });
     });
diff --git a/tests/parallel/test-http-write-head.js b/tests/parallel/test-http-write-head.js
index b7c7b6c..db0dd37 100644
--- a/tests/parallel/test-http-write-head.js
+++ b/tests/parallel/test-http-write-head.js
@@ -25,7 +25,7 @@ var s = http.createServer(function(req, res) {
     res.setHeader('foo', undefined);
   } catch (e) {
     assert.ok(e instanceof Error);
-    assert.ok(e.message.indexOf('"value"') != -1);
+    assert.ok(e.message.indexOf('value') != -1);
     threw = true;
   }
   assert.ok(threw, 'Undefined value should throw');