diff --git a/hack/config-go.sh b/hack/config-go.sh
index 1023b820603..69c8546ca52 100644
--- a/hack/config-go.sh
+++ b/hack/config-go.sh
@@ -59,7 +59,7 @@ mkdir -p "${KUBE_GO_PACKAGE_BASEDIR}"
 # Create symlink under output/go/src.
 ln -snf "${KUBE_REPO_ROOT}" "${KUBE_GO_PACKAGE_DIR}"
 
-GOPATH="${KUBE_TARGET}:${KUBE_REPO_ROOT}/third_party"
+GOPATH="${KUBE_TARGET}:`godep path`"
 export GOPATH
 
 # Unset GOBIN in case it already exsits in the current session.
diff --git a/hack/test-go.sh b/hack/test-go.sh
index dd4d3e8ab41..26bb5cb183f 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -25,9 +25,11 @@ find_test_dirs() {
   find . -not \( \
       \( \
         -wholename './third_party' \
+	-wholename './Godeps' \
         -o -wholename './release' \
         -o -wholename './target' \
         -o -wholename '*/third_party/*' \
+	-o -wholename '*/Godeps/*' \
         -o -wholename '*/output/*' \
       \) -prune \
     \) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u | xargs -n1 printf "${KUBE_GO_PACKAGE}/%s\n"
diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh
index 81491f8d15e..6644fc263d1 100755
--- a/hack/verify-gofmt.sh
+++ b/hack/verify-gofmt.sh
@@ -26,7 +26,7 @@ fi
 
 REPO_ROOT="$(cd "$(dirname "$0")/../" && pwd -P)"
 
-files="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "third_party/\|release/\|output/\|target/")"
+files="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "third_party/\|release/\|output/\|target/\|Godeps/")"
 bad=$(gofmt -s -l ${files})
 if [[ -n "${bad}" ]]; then
   echo "$bad"