diff --git a/hack/build-go.sh b/hack/build-go.sh
index 4b41ec128a9..892419ce01a 100755
--- a/hack/build-go.sh
+++ b/hack/build-go.sh
@@ -25,13 +25,10 @@ source $(dirname $0)/config-go.sh
 
 cd "${KUBE_TARGET}"
 
-BINARIES="proxy integration apiserver controller-manager kubelet kubecfg"
+BINARIES="cmd/proxy cmd/integration cmd/apiserver cmd/controller-manager cmd/kubelet cmd/kubecfg"
 
 if [ $# -gt 0 ]; then
   BINARIES="$@"
 fi
 
-for b in $BINARIES; do
-  echo "+++ Building ${b}"
-  go build "${KUBE_GO_PACKAGE}"/cmd/${b}
-done
+go build $(for b in $BINARIES; do echo "${KUBE_GO_PACKAGE}"/${b}; done)
\ No newline at end of file
diff --git a/hack/integration-test.sh b/hack/integration-test.sh
index 91fa62139d5..a0a796d872e 100755
--- a/hack/integration-test.sh
+++ b/hack/integration-test.sh
@@ -22,7 +22,7 @@ fi
 # Stop right away if the build fails
 set -e
 
-$(dirname $0)/build-go.sh integration
+$(dirname $0)/build-go.sh cmd/integration
 
 ETCD_DIR=$(mktemp -d -t kube-integration.XXXXXX)
 trap "rm -rf ${ETCD_DIR}" EXIT