diff --git a/.travis.yml b/.travis.yml
index fa6011b..c9215b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -160,81 +160,39 @@ matrix:
       env:
         - CXX_COMPILER=clang++-6.0 CC_COMPILER=clang-6.0
 
+    - os: linux
+      compiler: clang++
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+          packages:
+            - clang-7
+      env:
+        - CXX_COMPILER=clang++-7 CC_COMPILER=clang-7
+
     - os: osx
       compiler: clang++
-      osx_image: xcode7.0
+      osx_image: xcode7
       env:
         - CXX_COMPILER=clang++ CC_COMPILER=clang
 
     - os: osx
       compiler: clang++
-      osx_image: xcode7.1
+      osx_image: xcode8
       env:
         - CXX_COMPILER=clang++ CC_COMPILER=clang
 
     - os: osx
       compiler: clang++
-      osx_image: xcode7.2
+      osx_image: xcode9
       env:
         - CXX_COMPILER=clang++ CC_COMPILER=clang
 
     - os: osx
       compiler: clang++
-      osx_image: xcode7.3
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode8.0
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode8.1
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode8.2
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode8.3
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode9.0
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode9.1
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode9.2
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode9.3
-      env:
-        - CXX_COMPILER=clang++ CC_COMPILER=clang
-
-    - os: osx
-      compiler: clang++
-      osx_image: xcode9.4
+      osx_image: xcode10
       env:
         - CXX_COMPILER=clang++ CC_COMPILER=clang
 
@@ -254,6 +212,7 @@ install:
       elif [[ "${CXX}" == "clang++-4.0" ]]; then LLVM_VERSION="4.0.1";
       elif [[ "${CXX}" == "clang++-5.0" ]]; then LLVM_VERSION="5.0.2";
       elif [[ "${CXX}" == "clang++-6.0" ]]; then LLVM_VERSION="6.0.1";
+      elif [[ "${CXX}" == "clang++-7" ]]; then LLVM_VERSION="7.0.0";
       fi
       LLVM_URL="http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"
       LIBCXX_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxx-${LLVM_VERSION}.src.tar.xz"