diff --git a/.travis.yml b/.travis.yml
index 629bec87..fd405df8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,14 @@ matrix:
           packages: ['g++-5', 'valgrind']
       env: COMPILER=g++-5
 
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-6', 'valgrind']
+      env: COMPILER=g++-6
+
     - os: linux
       compiler: clang
       addons:
@@ -45,6 +53,14 @@ matrix:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
           packages: ['clang-3.7', 'valgrind']
       env: COMPILER=clang++-3.7
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8']
+          packages: ['clang-3.8', 'valgrind']
+      env: COMPILER=clang++-3.8
      
    # - os: osx
    #   compiler: clang
@@ -57,11 +73,3 @@ script:
   - make CXX=$COMPILER CXXFLAGS="-lstdc++"
   - ./json_unit "*"
   - valgrind --error-exitcode=1 --leak-check=full ./json_unit
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/f1196addb0e97a5ff396
-    on_success: change
-    on_failure: always
-    on_start: never