diff --git a/.travis.yml b/.travis.yml
index aca26e86..f5830601 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,24 @@
 language: go
 
 go:
-  - 1.6
-  - 1.5
+  - 1.7
   - tip
 
 sudo: false
 
-before_install:
-  - export GO15VENDOREXPERIMENT=1
-  - RepoName=`basename $PWD`; SrcDir=`dirname $PWD`; DestDir="`dirname $SrcDir`/coreos"
-  - if [[ "$SrcDir" != "$DestDir" ]]; then mv "$SrcDir" "$DestDir"; cd ../../coreos/$RepoName; export TRAVIS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/$RepoName; fi
-
-
 install:
-  - echo 'nop'
+- mkdir $GOPATH/bin && curl https://glide.sh/get | sh
 
 script:
-  - go test -v $(go list ./... | grep -v /vendor/)
+- go test $(glide novendor | grep -v contrib)
 
 services:
-  - postgresql
+- postgresql
 
 addons:
   apt:
     packages:
-      - rpm
+    - rpm
   postgresql: "9.4"
 
 notifications:
@@ -33,4 +26,4 @@ notifications:
 
 matrix:
   allow_failures:
-    - go: tip
\ No newline at end of file
+  - go: tip