diff --git a/.travis.yml b/.travis.yml
index 0f68a4ba..9efb17f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,11 @@ os:
 dist: trusty
 sudo: false
 
+# OS X only supports one image. Us the latest.
 osx_image:
-  - xcode6.4
-  - xcode7.3
   - xcode8.2
+#  - xcode7.3
+#  - xcode6.4
 
 git:
   depth: 3
@@ -31,11 +32,6 @@ env:
     - BUILD_MODE="ubsan"
     - BUILD_MODE="valgrind"
 
-#matrix:
-#  allow_failures:
-#    - os: linux
-#      env: BUILD_MODE="lint"
-
   exclude:
     # Skip GCC on OS X entirely
     - os: osx