diff --git a/build/common.sh b/build/common.sh
index 6929a38349e..97a5fc244fc 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -949,6 +949,11 @@ function kube::release::package_test_tarball() {
     cp "${test_bins[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
       "${release_stage}/platforms/${platform}"
   done
+  for platform in "${KUBE_NODE_TEST_PLATFORMS[@]}"; do
+    mkdir -p "${release_stage}/platforms/${platform}"
+    cp "${KUBE_NODE_TEST_BINARIES[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
+      "${release_stage}/platforms/${platform}"
+  done
 
   # Add the test image files
   mkdir -p "${release_stage}/test/images"
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index ccd6c0a8808..300ab571ca9 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -125,7 +125,6 @@ kube::golang::test_targets() {
     federation/cmd/genfeddocs
     vendor/github.com/onsi/ginkgo/ginkgo
     test/e2e/e2e.test
-    test/e2e_node/e2e_node.test
   )
   if [ -n "${KUBERNETES_CONTRIB:-}" ]; then
     for contrib in "${KUBERNETES_CONTRIB}"; do
@@ -148,6 +147,15 @@ readonly KUBE_TEST_PORTABLE=(
   hack/lib
 )
 
+# Node test has built-in etcd and kube-apiserver, it can only be built on the
+# same platforms with kube-apiserver.
+readonly KUBE_NODE_TEST_TARGETS=(
+  vendor/github.com/onsi/ginkgo/ginkgo
+  test/e2e_node/e2e_node.test
+)
+readonly KUBE_NODE_TEST_BINARIES=("${KUBE_NODE_TEST_TARGETS[@]##*/}")
+readonly KUBE_NODE_TEST_PLATFORMS=("${KUBE_SERVER_PLATFORMS[@]}")
+
 # Gigabytes desired for parallel platform builds. 11 is fairly
 # arbitrary, but is a reasonable splitting point for 2015
 # laptops-versus-not.
@@ -163,6 +171,7 @@ readonly KUBE_ALL_TARGETS=(
   "${KUBE_SERVER_TARGETS[@]}"
   "${KUBE_CLIENT_TARGETS[@]}"
   "${KUBE_TEST_TARGETS[@]}"
+  "${KUBE_NODE_TEST_TARGETS[@]}"
 )
 readonly KUBE_ALL_BINARIES=("${KUBE_ALL_TARGETS[@]##*/}")
 
diff --git a/hack/make-rules/cross.sh b/hack/make-rules/cross.sh
index 46bb4cf0217..f27df5f7677 100755
--- a/hack/make-rules/cross.sh
+++ b/hack/make-rules/cross.sh
@@ -32,3 +32,5 @@ make all WHAT="${KUBE_SERVER_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_SERVER_PL
 make all WHAT="${KUBE_CLIENT_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_CLIENT_PLATFORMS[*]}"
 
 make all WHAT="${KUBE_TEST_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_PLATFORMS[*]}"
+
+make all WHAT="${KUBE_NODE_TEST_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_NODE_TEST_PLATFORMS[*]}"