diff --git a/.travis.yml b/.travis.yml
index 41dca2daf..ed018a6db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,11 @@ services:
 language: go
 
 go:
-  - 1.5.3
   - 1.6
+  - tip
 
 env:
-  - DOCKER_VERSION=1.9.1 GO15VENDOREXPERIMENT=1
+  - DOCKER_VERSION=1.9.1
 
 matrix:
   allow_failures:
diff --git a/scripts/build.sh b/scripts/build.sh
index c1faef5b6..90e6b0853 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -3,8 +3,6 @@
 # This script builds the application from source for multiple platforms.
 set -e
 
-export GO15VENDOREXPERIMENT=1
-
 # Get the parent directory of where this script is.
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
diff --git a/scripts/test.sh b/scripts/test.sh
index d1828e3b1..ea23141d5 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-export GO15VENDOREXPERIMENT=1
-
 # Create a temp dir and clean it up on exit
 TEMPDIR=`mktemp -d -t nomad-test.XXX`
 trap "rm -rf $TEMPDIR" EXIT HUP INT QUIT TERM