diff --git a/.travis.yml b/.travis.yml
index be884da..02d0880 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
   - NODE_VERSION="iojs-v3"
   - NODE_VERSION="4"
   - NODE_VERSION="5"
+  - NODE_VERSION="6"
 
 matrix:
   allow_failures:
diff --git a/README.md b/README.md
index 9f667c7..e1e59de 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Node.js API. You can use it to eliminate your shell script's dependency on Unix
 its familiar and powerful commands. You can also install it globally so you can run it from outside
 Node projects - say goodbye to those gnarly Bash scripts!
 
-ShellJS supports node `v0.11`, `v0.12`, `v4`, `v5`, and all releases of iojs.
+ShellJS supports node `v0.11`, `v0.12`, `v4`, `v5`, `v6`, and all releases of iojs.
 
 The project is [unit-tested](http://travis-ci.org/shelljs/shelljs) and battled-tested in projects like:
 
diff --git a/test/pwd.js b/test/pwd.js
index 9a25bc8..55f3724 100644
--- a/test/pwd.js
+++ b/test/pwd.js
@@ -23,6 +23,6 @@ var _pwd = shell.pwd();
 assert.equal(_pwd.code, 0);
 assert.ok(!_pwd.stderr);
 assert.equal(shell.error(), null);
-assert.equal(path.basename(_pwd), 'tmp');
+assert.equal(path.basename(_pwd.toString()), 'tmp');
 
 shell.exit(123);