diff --git a/.travis.yml b/.travis.yml
index 6386c7398..a9e5cc3cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: go
 go:
 - 1.3.3
 - 1.4.2
-- tip
 
 env:
   global:
@@ -32,7 +31,11 @@ script:
 - make fmt
 
 matrix:
+  include:
+    - go: tip
+      env: KAFKA_VERSION=0.8.2.1
   allow_failures:
     - go: tip
+  fast_finish: true
 
 sudo: false