diff --git a/.travis.yml b/.travis.yml
index bba8f34b..0f72d8d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,23 @@
-language: node_js
-node_js:
-  - "0.10"
-  - "0.11"
-  - "0.12"
-  - "4.2.4"
+language: c++
+env:
+  - NODE_VERSION="0.10"
+  - NODE_VERSION="0.11"
+  - NODE_VERSION="0.12"
+  - NODE_VERSION="4"
+  - NODE_VERSION="5"
+
+# keep this blank to make sure there are no before_install steps
+before_install:
+
+install:
+  - rm -rf ~/.nvm
+  - git clone https://github.com/creationix/nvm.git ~/.nvm
+  - source ~/.nvm/nvm.sh
+  - nvm install $NODE_VERSION
+  - node --version
+  - npm install
+os:
+  - linux
+  - osx
+script:
+  - npm test