diff --git a/.travis.yml b/.travis.yml
index 7052557..42771b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,13 +48,6 @@ matrix:
             - llvm-toolchain-precise-3.7
             - llvm-toolchain-precise
 
-    # Clang 3.6
-    - env: UNIT_TESTS=true COMPILER=clang++-3.6
-      addons:
-        apt:
-          packages: ["clang-3.6"]
-          sources: *sources
-
     # Clang 3.7
     - env: UNIT_TESTS=true COMPILER=clang++-3.7
       addons:
@@ -62,26 +55,11 @@ matrix:
           packages: ["clang-3.7"]
           sources: *sources
 
-    # Xcode 7
-    - os: osx
-      env: UNIT_TESTS=true COMPILER=clang++
-      osx_image: xcode7
-
     # Xcode 6.3
     - os: osx
       env: UNIT_TESTS=true COMPILER=clang++
       osx_image: beta-xcode6.3
 
-    # Xcode 6.4
-    - os: osx
-      env: UNIT_TESTS=true COMPILER=clang++
-      osx_image: xcode6.4
-
-    # Xcode 7
-    - os: osx
-      env: UNIT_TESTS=true COMPILER=clang++
-      osx_image: xcode7
-
     # Xcode 7.1
     - os: osx
       env: UNIT_TESTS=true COMPILER=clang++
diff --git a/test/bind_expression.cpp b/test/bind_expression.cpp
index 4eed23d..ea46454 100644
--- a/test/bind_expression.cpp
+++ b/test/bind_expression.cpp
@@ -47,13 +47,13 @@ auto letters(
     const Letter& l6,
     const Letter& l7
     ) {
-    auto ss = std::stringstream{};
+    std::stringstream ss{};
     ss << l1 << l2 << l3 << l4 << l5 << l6 << l7;
     return ss.str();
 }
 
 auto ordered_letters(A a, B b, C c, D d, E e, F f, G g) {
-    auto ss = std::stringstream{};
+    std::stringstream ss{};
     ss << a << b << c << d << e << f << g;
     return ss.str();
 }
diff --git a/test/bind_expression_parser.cpp b/test/bind_expression_parser.cpp
index 7768d45..ce41cce 100644
--- a/test/bind_expression_parser.cpp
+++ b/test/bind_expression_parser.cpp
@@ -43,7 +43,7 @@ DEFINE_TEST_LETTER(G);
 // with ct::bind_expr
 
 auto ordered_letters(A a, B b, C c, D d, E e, F f, G g) {
-    auto ss = std::stringstream{};
+    std::stringstream ss{};
     ss << a << b << c << d << e << f << g;
     return ss.str();
 }