diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0492bc81..cabd0a80 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,10 +12,10 @@ references:
         sudo touch /etc/apt/sources.list.d/clang.list
         sudo chmod o+w /etc/apt/sources.list.d/clang.list
         cat > /etc/apt/sources.list.d/clang.list << EOF
-        #deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main
-        #deb-src http://apt.llvm.org/trusty/ llvm-toolchain-trusty main
         deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.7 main
         deb-src http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.7 main
+        deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.8 main
+        deb-src http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.8 main
         deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main
         deb-src http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main
         deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main
@@ -108,27 +108,81 @@ references:
         only: /.*/
 
 jobs:
-  build_and_test_gcc:
+  gcc_4_8:
     <<: *job_definition
     environment:
       CC: gcc-4.8
       CXX: g++-4.8
       BUILD_TOOLSET: gcc
       APT_COMPILER_PACKAGE: "g++-4.8"
-  build_and_test_clang:
+  gcc_5:
+    <<: *job_definition
+    environment:
+      CC: gcc-5
+      CXX: g++-5
+      BUILD_TOOLSET: gcc
+      APT_COMPILER_PACKAGE: "g++-5"
+  gcc_6:
+    <<: *job_definition
+    environment:
+      CC: gcc-6
+      CXX: g++-6
+      BUILD_TOOLSET: gcc
+      APT_COMPILER_PACKAGE: "g++-6"
+  gcc_7:
+    <<: *job_definition
+    environment:
+      CC: gcc-7
+      CXX: g++-7
+      BUILD_TOOLSET: gcc
+      APT_COMPILER_PACKAGE: "g++-7"
+  clang_3_7:
     <<: *job_definition
     environment:
       CC: clang-3.7
       CXX: clang++-3.7
       BUILD_TOOLSET: clang
       APT_COMPILER_PACKAGE: clang-3.7
+  clang_3_8:
+    <<: *job_definition
+    environment:
+      CC: clang-3.8
+      CXX: clang++-3.8
+      BUILD_TOOLSET: clang
+      APT_COMPILER_PACKAGE: clang-3.8
+  clang_4_0:
+    <<: *job_definition
+    environment:
+      CC: clang-4.0
+      CXX: clang++-4.0
+      BUILD_TOOLSET: clang
+      APT_COMPILER_PACKAGE: clang-4.0
+  clang_5_0:
+    <<: *job_definition
+    environment:
+      CC: clang-5.0
+      CXX: clang++-5.0
+      BUILD_TOOLSET: clang
+      APT_COMPILER_PACKAGE: clang-5.0
 
 workflows:
   version: 2
 
   build_and_test:
     jobs:
-    - build_and_test_gcc:
+    - gcc_4_8:
         <<: *enable_for_tags
-    - build_and_test_clang:
+    - gcc_5:
+        <<: *enable_for_tags
+    - gcc_6:
+        <<: *enable_for_tags
+    - gcc_7:
+        <<: *enable_for_tags
+    - clang_3_7:
+        <<: *enable_for_tags
+    - clang_3_8:
+        <<: *enable_for_tags
+    - clang_4_0:
+        <<: *enable_for_tags
+    - clang_5_0:
         <<: *enable_for_tags