diff --git a/.travis.yml b/.travis.yml
index d807a66..aefbc09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,8 @@ language: go
 sudo: required
 go:
   - 1.8
-before_install:
-  - go get -t -v ./...
 script:
   - make lint
-  - bash coverage.sh
+  - make collect-coverage
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
index 153fe08..ec80919 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ $(iso_target): iso_prereq kernel_image
 else
 VAGRANT_SRC_FOLDER = /home/vagrant/workspace
 
-.PHONY: kernel iso vagrant-up vagrant-down vagrant-ssh run gdb clean
+.PHONY: kernel iso vagrant-up vagrant-down vagrant-ssh run gdb clean lint lint-check-deps test collect-coverage
 
 kernel:
 	vagrant ssh -c 'cd $(VAGRANT_SRC_FOLDER); make GC_FLAGS="$(GC_FLAGS)" kernel'
@@ -173,8 +173,12 @@ lint: lint-check-deps
 		./...
 
 lint-check-deps:
-	@$(GO) get -u gopkg.in/alecthomas/gometalinter.v1
+	@GOPATH=$(GOPATH) $(GO) get -u -t gopkg.in/alecthomas/gometalinter.v1
 	@gometalinter.v1 --install >/dev/null
 
 test:
-	$(GO) test -cover ./...
+	GOPATH=$(GOPATH) $(GO) test -cover gopheros/...
+
+collect-coverage:
+	GOPATH=$(GOPATH) sh coverage.sh
+
diff --git a/coverage.sh b/coverage.sh
index d91f8fa..4b0827a 100644
--- a/coverage.sh
+++ b/coverage.sh
@@ -3,7 +3,7 @@ set -e
 
 echo "" > coverage.txt
 
-for d in $(go list ./... | grep -v vendor); do
+for d in $(go list ./... | grep gopheros); do
     go test -v -race -coverprofile=profile.out -covermode=atomic $d
     if [ -f profile.out ]; then
         cat profile.out >> coverage.txt