diff --git a/.travis.yml b/.travis.yml
index c9ec1e3335..0ea85ab9d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: ruby
+cache:
+  directories:
+    - $HOME/.gem/ruby
+    - Library/Homebrew/vendor/bundle
 
 matrix:
   include:
     - os: osx
-      osx_image: xcode8.1
+      osx_image: xcode8.3
       rvm: system
     - os: linux
       rvm: 2.0.0
diff --git a/Library/Homebrew/test/.bundle/config b/Library/Homebrew/test/.bundle/config
index e451829e9a..20549341c0 100644
--- a/Library/Homebrew/test/.bundle/config
+++ b/Library/Homebrew/test/.bundle/config
@@ -1,3 +1,4 @@
 ---
 BUNDLE_PATH: "../vendor/bundle"
 BUNDLE_DISABLE_SHARED_GEMS: "true"
+BUNDLE_BIN: "../bin"