diff --git a/.travis.yml b/.travis.yml
index f553603d..76ad6315 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,9 @@ services:
 language: go
 
 go:
-  - 1.5.3
-  - 1.6
+  - 1.5.4
+  - 1.6.2
+  - tip
 
 env:
   - DEX_TEST_DSN="postgres://postgres@127.0.0.1:15432/postgres?sslmode=disable" ISOLATED=true
@@ -43,3 +44,7 @@ deploy:
 
 notifications:
   email: false
+
+matrix:
+  allow_failures:
+    - go: tip
diff --git a/env b/env
index 773cb07a..d1f7bb8e 100644
--- a/env
+++ b/env
@@ -1,5 +1,6 @@
-MAJOR_GOVERSION=$( go version | grep -o 'go1\.[0-9]')
-FULL_GOVERSION=$( go version| grep -o 'go1\.[0-9|\.]*' )
+# For development versions of Go, these will be empty.
+MAJOR_GOVERSION=$( go version | grep -o 'go1\.[0-9]' || true)
+FULL_GOVERSION=$( go version| grep -o 'go1\.[0-9|\.]*' || true)
 
 # The list of unsupported major go versions.
 UNSUPPORTED=( "go1.0" "go1.1" "go1.2" "go1.3" "go1.4" )