diff --git a/cmd/kubeadm/BUILD b/cmd/kubeadm/BUILD
index 86a7f547e0b..f77bb9ced1f 100644
--- a/cmd/kubeadm/BUILD
+++ b/cmd/kubeadm/BUILD
@@ -33,7 +33,7 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//cmd/kubeadm/app:all-srcs",
-        "//cmd/kubeadm/test:all-srcs",
+        "//cmd/kubeadm/test/cmd:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/cmd/kubeadm/test/BUILD b/cmd/kubeadm/test/cmd/BUILD
similarity index 94%
rename from cmd/kubeadm/test/BUILD
rename to cmd/kubeadm/test/cmd/BUILD
index 1e874a1f86d..48e86ffd2f6 100644
--- a/cmd/kubeadm/test/BUILD
+++ b/cmd/kubeadm/test/cmd/BUILD
@@ -17,7 +17,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["token_test.go"],
-    args = ["--kubeadm-path=../kubeadm"],
+    args = ["--kubeadm-path=../../kubeadm"],
     data = ["//cmd/kubeadm"],
     library = ":go_default_library",
     tags = [
diff --git a/cmd/kubeadm/test/token_test.go b/cmd/kubeadm/test/cmd/token_test.go
similarity index 79%
rename from cmd/kubeadm/test/token_test.go
rename to cmd/kubeadm/test/cmd/token_test.go
index 5f08f7586fe..ea69bf8eefe 100644
--- a/cmd/kubeadm/test/token_test.go
+++ b/cmd/kubeadm/test/cmd/token_test.go
@@ -28,14 +28,15 @@ const (
 	TokenExpectedRegex = "^\\S{6}\\:\\S{16}\n$"
 )
 
-var kubeadmPath string
-
-func init() {
-	flag.StringVar(&kubeadmPath, "kubeadm-path", filepath.Join(os.Getenv("KUBE_ROOT"), "cluster/kubeadm.sh"), "Location of kubeadm")
-}
+var kubeadmPath = flag.String("kubeadm-path", filepath.Join(os.Getenv("KUBE_ROOT"), "cluster/kubeadm.sh"), "Location of kubeadm")
+var kubeadmCmdSkip = flag.Bool("kubeadm-cmd-skip", false, "Skip kubeadm cmd tests")
 
 func TestCmdTokenGenerate(t *testing.T) {
-	stdout, _, err := RunCmd(kubeadmPath, "ex", "token", "generate")
+	if *kubeadmCmdSkip {
+		t.Log("kubeadm cmd tests being skipped")
+		t.Skip()
+	}
+	stdout, _, err := RunCmd(*kubeadmPath, "ex", "token", "generate")
 	if err != nil {
 		t.Fatalf("'kubeadm ex token generate' exited uncleanly: %v", err)
 	}
@@ -59,8 +60,12 @@ func TestCmdTokenGenerateTypoError(t *testing.T) {
 		with a non-zero status code after showing the command's usage, so that
 		the usage itself isn't captured as a token without the user noticing.
 	*/
+	if *kubeadmCmdSkip {
+		t.Log("kubeadm cmd tests being skipped")
+		t.Skip()
+	}
 
-	_, _, err := RunCmd(kubeadmPath, "ex", "token", "genorate") // subtle typo
+	_, _, err := RunCmd(*kubeadmPath, "ex", "token", "genorate") // subtle typo
 	if err == nil {
 		t.Error("'kubeadm ex token genorate' (a deliberate typo) exited without an error when we expected non-zero exit status")
 	}
diff --git a/cmd/kubeadm/test/util.go b/cmd/kubeadm/test/cmd/util.go
similarity index 100%
rename from cmd/kubeadm/test/util.go
rename to cmd/kubeadm/test/cmd/util.go
diff --git a/hack/make-rules/test-kubeadm-cmd.sh b/hack/make-rules/test-kubeadm-cmd.sh
index c6cbbfe52e0..fadb83bdf3a 100755
--- a/hack/make-rules/test-kubeadm-cmd.sh
+++ b/hack/make-rules/test-kubeadm-cmd.sh
@@ -28,5 +28,5 @@ KUBEADM_PATH="${KUBEADM_PATH:=$(kube::realpath "${KUBE_ROOT}")/cluster/kubeadm.s
 make -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
 
 make -C "${KUBE_ROOT}" test \
-  WHAT=k8s.io/kubernetes/cmd/kubeadm/test \
+  WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd \
   KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'"
diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt
index f2b64c149db..d9bf2871cef 100644
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -327,6 +327,7 @@ kube-master
 kube-master-url
 kube-reserved
 kubeadm-path
+kubeadm-cmd-skip
 kubecfg-file
 kubectl-path
 kubelet-address