diff --git a/.travis.yml b/.travis.yml
index f24aa1e..e104b9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ go:
 - 1.3
 - 1.4
 - 1.5
-- 1.6
+- 1.6beta1
 - tip
 
 sudo: false
@@ -25,6 +25,7 @@ script:
 - go test $PACKAGES
 
 before_deploy:
+- export GOROOT_BOOTSTRAP=$GOROOT
 - go get github.com/laher/goxc
 - goxc -t -bc="linux darwin windows"
 - goxc -d=./ -wd=./cmd/tusd -bc="linux darwin windows"
@@ -48,5 +49,5 @@ deploy:
 
   on:
     tags: true
-    go: 1.4
+    go: 1.5
     repo: tus/tusd