diff --git a/test.sh b/test.sh
index 31196f7ec..f48faffd3 100755
--- a/test.sh
+++ b/test.sh
@@ -4,8 +4,13 @@ set -e
 # Get GOPATH, etc from build
 . ./build
 
+# use right GOPATH
+export GOPATH="${PWD}"
+
 # Unit tests
+go test -i ./store
 go test -v ./store
 
 # Functional tests
+go test -i ./tests/functional
 ETCD_BIN_PATH=$(pwd)/etcd go test -v ./tests/functional