diff --git a/.travis.yml b/.travis.yml
index 2f2eda4..a0b7a7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,25 @@
+sudo: false
+
 language: go
 
 go:
   - 1.6.3
+  - 1.7.1
   - tip
 
+branches:
+  only:
+  - master
+  - develop
+
 os:
   - linux
   - osx
 
-sudo: false
+matrix:
+  fast_finish: true
+  allow_failures:
+    - go: tip
 
 before_install:
   - go get -v pkg.re/essentialkaos/ek.v3