diff --git a/.travis.yml b/.travis.yml
index 4d7a5d64..0e7b2ed7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,68 @@
 language: node_js
-sudo: required
-dist: trusty
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
-node_js:
-  - "4"
-  - "6"
-  - "8"
-  - "9"
+matrix:
+  include:
+    # Test on Ubuntu Trusty
+    - sudo: required
+      dist: trusty
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
+      node_js: "6"
+    - sudo: required
+      dist: trusty
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
+      node_js: "8"
+    - sudo: required
+      dist: trusty
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
+      node_js: "9"
+    - sudo: required
+      dist: trusty
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
+      node_js: "10"
+    # Test Node.js master nightly build
+    - node_js: "node"
+      sudo: required
+      dist: trusty
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
+      env:
+        - NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly
+        - NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly
+    # Test Node.js v8-canary nightly build
+    - node_js: "node"
+      sudo: required
+      dist: trusty
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install lldb-3.9 liblldb-3.9-dev -y
+      env:
+        - NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary
+        - NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary
+    # Test on OS X
+    - os: osx
+      osx_image: xcode9.3
+      node_js: "6"
+    - os: osx
+      osx_image: xcode9.3
+      node_js: "8"
+    - os: osx
+      osx_image: xcode9.3
+      node_js: "9"
+    - os: osx
+      osx_image: xcode9.3
+      node_js: "10"
+  allow_failures:
+    # Allow the nightly installs to fail
+    - env: "NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly NODEJS_ORG_MIRROR=https://nodejs.org/download/nightly"
+    - env: "NVM_NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary NODEJS_ORG_MIRROR=https://nodejs.org/download/v8-canary"
 branches:
   only:
     - master
diff --git a/README.md b/README.md
index 78d0ea18..f606ca56 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 </p>
 
 [![npm](https://img.shields.io/npm/v/llnode.svg?style=flat-square)](https://npmjs.org/package/llnode)
-[![Build Status](https://img.shields.io/travis/nodejs/llnode.svg?style=flat-square)](https://travis-ci.org/nodejs/llnode)
+
 
 Node.js v4.x+ C++ plugin for the [LLDB](http://lldb.llvm.org) debugger.
 
@@ -21,7 +21,18 @@ with Node.js processes or core dumps in LLDB.
 
 https://asciinema.org/a/29589
 
-### Quick start
+## Build Status
+
+| Version | v6.x                    | v8.x                    | v9.x                    | v10.x                     | master                        | v8-canary                        |
+|---------|-------------------------|-------------------------|-------------------------|---------------------------|-------------------------------|----------------------------------|
+| **Trusty**  | [![v6.x badge][v6-trusty-badge]][travis] | [![v8.x badge][v8-trusty-badge]][travis] | [![v9.x badge][v9-trusty-badge]][travis] | [![v10.x badge][v10-trusty-badge]][travis] | [![master badge][master-trusty-badge]][travis] | [![v8-canary badge][canary-trusty-badge]][travis] |
+| **OS X**  | [![v6.x badge][v6-osx-badge]][travis] | [![v8.x badge][v8-osx-badge]][travis] | [![v9.x badge][v9-osx-badge]][travis] | [![v10.x badge][v10-osx-badge]][travis] | - | - |
+
+We have nightly test runs against all Node.js active release lines. We also test
+against Node.js master and Node.js v8-canary nightly builds to help us identify
+breaking changes on Node.js and V8 before they land on an active release line.
+
+## Quick start
 
 Start an LLDB session with the llnode plugin automatically loaded:
 
@@ -331,3 +342,15 @@ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
 DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[travis]: https://travis-ci.org/mmarchini/llnode
+[v6-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/1
+[v8-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/2
+[v9-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/3
+[v10-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/4
+[master-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/5
+[canary-trusty-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/6
+[v6-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/7
+[v8-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/8
+[v9-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/9
+[v10-osx-badge]: https://travis-matrix-badges.herokuapp.com/repos/mmarchini/llnode/branches/master/10