diff --git a/.travis.yml b/.travis.yml
index 0084bf9c28..2dfb7e283d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,9 @@ install:
   - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
   - go get github.com/mattn/goveralls
   - go get gopkg.in/check.v1
-  - DEPS=$(go list -f '{{.Imports}}' ./... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$DEPS" ]; then go get -d -v $DEPS; fi
+  - go get github.com/tools/godep
 before_script:
+  - godep restore
   - gofmt -l -w .
   - goimports -l -w .
   - golint .