diff --git a/.travis.yml b/.travis.yml
index 6fe85fc..3c25dfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,23 @@
   - 1.6rc2
   - tip
 
+matrix:
+  allow_failures:
+    - go: tip
+
 sudo: false
 
 os:
   - linux
   - osx
 
-addons:
-  ssh_known_hosts:
-    - bitbucket.org
+# 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: