diff --git a/.travis.yml b/.travis.yml
index 9665eb49a5..73b51a37c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: go
 
 go:
+  - 1.6
   - tip
 
 branches:
diff --git a/Vagrantfile b/Vagrantfile
index 63d38da4da..bade237b59 100755
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,7 +5,7 @@
 VAGRANTFILE_API_VERSION = '2'
 
 @script = <<SCRIPT
-GOVERSION="1.5.3"
+GOVERSION="1.6"
 SRCROOT="/opt/go"
 SRCPATH="/opt/gopath"