diff --git a/.travis.yml b/.travis.yml
index c2bdbf0..6e97afd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,7 +92,9 @@
       dist: trusty
       addons:
         apt:
-          sources: llvm-toolchain-trusty-3.9
+          sources:
+            - llvm-toolchain-trusty-3.9
+            - ubuntu-toolchain-r-test
           packages: clang-3.9
       env:
         - CXX=clang++-3.9
@@ -101,11 +103,24 @@
       dist: trusty
       addons:
         apt:
-          sources: llvm-toolchain-trusty-4.0
+          sources:
+            - llvm-toolchain-trusty-4.0
+            - ubuntu-toolchain-r-test
           packages: clang-4.0
       env:
         - CXX=clang++-4.0
         - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-5.0
+            - ubuntu-toolchain-r-test
+          packages: clang-5.0
+      env:
+        - CXX=clang++-5.0
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
 
     # macOS/clang
     # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
@@ -121,6 +136,10 @@
       osx_image: xcode8.3
       env:
         - NODE_LABELS="OSX OSX-10.12"
+    - os: osx
+      osx_image: xcode9
+      env:
+        - NODE_LABELS="OSX OSX-10.12"
 
 before_script:
   - ${CXX:-c++} --version