diff --git a/.travis.yml b/.travis.yml
index d5faf02..2430b4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,32 @@
 language: go
-go_import_path: github.com/FiloSottile/gvt
+
 go:
-  - 1.5.2
-  - 1.4.3
+  - 1.5.3
+  - 1.6rc2
   - tip
 
+matrix:
+  allow_failures:
+    - go: tip
+
 sudo: false
 
-addons:
-  ssh_known_hosts:
-      - bitbucket.org
+os:
+  - linux
+  - osx
 
-script:
-  - go test -v ./...
+# ssh_known_hosts is broken on OS X, run ssh-keyscan manually instead
+# See https://github.com/travis-ci/travis-ci/issues/5596
+# addons:
+#   ssh_known_hosts:
+#     - bitbucket.org
+before_install:
+  - ssh-keyscan -t rsa -T 30 -H bitbucket.org | tee -a $HOME/.ssh/known_hosts
+
+env:
+  global:
+    - GO15VENDOREXPERIMENT="1"
+
+install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bazaar; fi