diff --git a/hack/make-rules/test-cmd.sh b/hack/make-rules/test-cmd.sh
index ff058b891f..e8747d3275 100755
--- a/hack/make-rules/test-cmd.sh
+++ b/hack/make-rules/test-cmd.sh
@@ -97,6 +97,20 @@ function create_node() {
 __EOF__
 }
 
+# Run it if:
+# 1) $WHAT is empty
+# 2) $WHAT is not empty and kubeadm is part of $WHAT
+WHAT=${WHAT:-}
+if [[ ${WHAT} == "" || ${WHAT} =~ .*kubeadm.* ]] ; then
+  kube::log::status "Running kubeadm tests"  
+  run_kubeadm_tests
+  # if we ONLY want to run kubeadm, then exit here.
+  if [[ ${WHAT} == "kubeadm" ]]; then
+    kube::log::status "TESTS PASSED"
+    exit 0
+  fi
+fi
+
 kube::log::status "Running kubectl tests for kube-apiserver"
 
 setup
diff --git a/test/cmd/kubeadm.sh b/test/cmd/kubeadm.sh
index aae65bf974..bef6edb577 100755
--- a/test/cmd/kubeadm.sh
+++ b/test/cmd/kubeadm.sh
@@ -28,9 +28,12 @@ run_kubeadm_tests() {
   # comment this out to save yourself from needlessly building here.
   make -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
 
+  #TODO(runyontr): Remove the the KUBE_TIMEOUT override when 
+  # kubernetes/kubeadm/issues/1430 is fixed
   make -C "${KUBE_ROOT}" test \
   WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd \
-  KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'"
+  KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'" \
+  KUBE_TIMEOUT="--timeout 600s"
   set +o nounset
   set +o errexit
 }
\ No newline at end of file
diff --git a/test/cmd/legacy-script.sh b/test/cmd/legacy-script.sh
index b84ea798dd..0aec3a3318 100755
--- a/test/cmd/legacy-script.sh
+++ b/test/cmd/legacy-script.sh
@@ -397,7 +397,10 @@ runTests() {
    if [[ -n "${WHAT-}" ]]; then
     for pkg in ${WHAT}
     do 
-      record_command run_${pkg}_tests
+      # running of kubeadm is captured in hack/make-targets/test-cmd.sh
+      if [[ "$pkg" != "kubeadm" ]]; then 
+        record_command run_${pkg}_tests
+      fi
     done
     cleanup_tests
     return