diff --git a/.travis.yml b/.travis.yml
index aac65d2c1..fa9c11e73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
 language: go
 sudo: false
+
 go:
   - 1.4
   - 1.5
   - tip
 
+matrix:
+  allow_failures:
+    - go: tip
+
 addons:
   apt:
     packages:
diff --git a/test b/test
index 69d91f0de..37267fc60 100755
--- a/test
+++ b/test
@@ -52,12 +52,12 @@ if [ $MACHINE_TYPE != "armv7l" ]; then
   RACE="--race"
 fi
 
-go test -timeout 3m ${COVER} $@ ${TEST} ${RACE} -cpu 1,2,4
-go test -timeout 3m ${COVER} $@ ${NO_RACE_TEST} -cpu 1,2,4
+go test -timeout 3m ${COVER} ${RACE} -cpu 1,2,4 $@ ${TEST}
+go test -timeout 3m ${COVER} -cpu 1,2,4 $@ ${NO_RACE_TEST}
 
 if [ -n "$INTEGRATION" ]; then
 	echo "Running integration tests..."
-	go test -timeout 10m $@ ${REPO_PATH}/integration -v -cpu 1,2,4
+	go test -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration
 fi
 
 echo "Checking gofmt..."