diff --git a/.travis.yml b/.travis.yml
index 908ed99..b01d5d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ matrix:
 
   include:
     - os: linux
+      compiler: gcc-4.7
       env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11
       addons:
         apt:
@@ -37,6 +38,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: gcc-4.8
       env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11
       addons:
         apt:
@@ -46,6 +48,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: gcc-4.9
       env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11
       addons:
         apt:
@@ -55,6 +58,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: gcc-5
       env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11
       addons:
         apt:
@@ -64,6 +68,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: gcc-5
       env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14
       addons:
         apt:
@@ -73,6 +78,17 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: gcc-5
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++1z
+      addons:
+        apt:
+          packages:
+            - g++-5
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: gcc-6
       env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11
       addons:
         apt:
@@ -82,6 +98,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: gcc-6
       env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14
       addons:
         apt:
@@ -91,6 +108,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: gcc-6
       env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z
       addons:
         apt:
@@ -100,6 +118,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      compiler: clang-3.5
       env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++11
       addons:
         apt:
@@ -110,6 +129,7 @@ matrix:
             - llvm-toolchain-precise-3.5
 
     - os: linux
+      compiler: clang-3.6
       env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11
       addons:
         apt:
@@ -120,6 +140,7 @@ matrix:
             - llvm-toolchain-precise-3.6
 
     - os: linux
+      compiler: clang-3.7
       env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11
       addons:
         apt:
@@ -130,6 +151,7 @@ matrix:
             - llvm-toolchain-precise-3.7
 
     - os: linux
+      compiler: clang-3.8
       env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11
       addons:
         apt:
@@ -140,6 +162,7 @@ matrix:
             - llvm-toolchain-precise-3.8
 
     - os: linux
+      compiler: clang-3.8
       env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14
       addons:
         apt:
@@ -150,6 +173,7 @@ matrix:
             - llvm-toolchain-precise-3.8
 
     - os: linux
+      compiler: clang-3.8
       env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z
       addons:
         apt:
@@ -160,6 +184,7 @@ matrix:
             - llvm-toolchain-precise-3.8
 
     - os: linux
+      compiler: clang-3.9
       env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++11
       addons:
         apt:
@@ -170,6 +195,7 @@ matrix:
             - llvm-toolchain-precise-3.9
 
     - os: linux
+      compiler: clang-3.9
       env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++14
       addons:
         apt:
@@ -180,6 +206,7 @@ matrix:
             - llvm-toolchain-precise-3.9
 
     - os: linux
+      compiler: clang-3.9
       env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++1z
       addons:
         apt:
@@ -200,13 +227,38 @@ matrix:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-trusty-4.0
 
+    - os: linux
+      compiler: clang-4.0
+      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=c++14
+      addons:
+        apt:
+          packages:
+            - clang-4.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
+
+    - os: linux
+      compiler: clang-4.0
+      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=c++1z
+      addons:
+        apt:
+          packages:
+            - clang-4.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
+
     - os: osx
+      compiler: clang
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11
 
     - os: osx
+      compiler: clang
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14
 
     - os: osx
+      compiler: clang
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++1z
 
 install: