diff --git a/.travis.yml b/.travis.yml
index df4345e..fb3e37c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,32 +3,22 @@ cache: cargo
 
 matrix:
   include:
-    - os: linux
-      rust: stable
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
-          packages:
-            - g++-6
-            - llvm-5.0-dev
-
     - os: linux
       rust: nightly
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
           packages:
-            - g++-6
-            - llvm-5.0-dev
+            - llvm-6.0-dev
+      env:
+        - MATRIX_EVAL="export LLVM_SYS_60_PREFIX=/usr/bin"
 
     - os: osx
-      rust: stable
+      rust: nightly
       env:
-        - MATRIX_EVAL="brew install llvm && export LLVM_SYS_50_PREFIX=/usr/local/opt/llvm"
+        - MATRIX_EVAL="export LLVM_SYS_60_PREFIX=/usr/local/opt/llvm && brew install llvm"
 
 before_install:
   - eval "${MATRIX_EVAL}"