diff --git a/.travis.yml b/.travis.yml
index 2dfb7e283d..cf8b02f5cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,7 @@ install:
   # - go get golang.org/x/tools/cmd/vet 
   - 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
-  - go get github.com/tools/godep
 before_script:
-  - godep restore
   - gofmt -l -w .
   - goimports -l -w .
   - golint .
diff --git a/gocoverage.sh b/gocoverage.sh
index d353bd08a3..e54a5cab03 100755
--- a/gocoverage.sh
+++ b/gocoverage.sh
@@ -1,11 +1,16 @@
 #!/bin/bash
-# The script does automatic checking on a Go package and its sub-packages, including:
-# 6. test coverage (http://blog.golang.org/cover)
 
 set -e
 
-# Run test coverage on each subdirectories and merge the coverage profile.
+# Add godep workspace to GOPATH. We do it manually instead of using
+# 'godep go test' or 'godep restore' so godep doesn't need to be installed.
+GOPATH="$PWD/Godeps/_workspace:$GOPATH"
+
+# Install packages before testing. Not doing this would cause
+# 'go test' to recompile all package dependencies before testing each package.
+go install ./...
 
+# Run test coverage on each subdirectories and merge the coverage profile.
 echo "mode: count" > profile.cov
 
 # Standard go tooling behavior is to ignore dirs with leading underscors