diff --git a/.travis.yml b/.travis.yml
index b2a3221..dd2095c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,15 +30,12 @@ addons:
       - clang-3.6
       - clang-3.7
       - clang-3.8
-      - clang-3.9
     sources:
       - ubuntu-toolchain-r-test
       - llvm-toolchain-precise
-      - llvm-toolchain-precise-3.5
       - llvm-toolchain-precise-3.6
       - llvm-toolchain-precise-3.7
       - llvm-toolchain-precise-3.8
-      - llvm-toolchain-precise-3.9
 
 matrix:
 
@@ -55,9 +52,6 @@ matrix:
     - os: linux
       env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11
 
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++11
-
     - os: linux
       env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11
 
@@ -67,9 +61,6 @@ matrix:
     - os: linux
       env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11
 
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++11
-
     - os: osx
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11
 
diff --git a/test/mp_valid.cpp b/test/mp_valid.cpp
index 65ecb9c..ed11ed1 100644
--- a/test/mp_valid.cpp
+++ b/test/mp_valid.cpp
@@ -48,8 +48,8 @@ int main()
 #endif
     BOOST_TEST_TRAIT_FALSE((mp_valid<add_pointer, void, void>));
 
-#if !defined( BOOST_GCC ) || !BOOST_WORKAROUND( BOOST_GCC, < 50500 )
-    // g++ up to at least 5.4 doesn't like add_reference for some reason or other
+#if !defined( BOOST_GCC ) || !BOOST_WORKAROUND( BOOST_GCC, < 70000 )
+    // g++ up to at least 6.2 doesn't like add_reference for some reason or other
     BOOST_TEST_TRAIT_FALSE((mp_valid<add_reference>));
 #if !defined( BOOST_MSVC ) || !BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
     // msvc-12.0 gives an internal error here