diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD
index 516d33cb19..5e3fc9ad02 100644
--- a/build/visible_to/BUILD
+++ b/build/visible_to/BUILD
@@ -134,6 +134,7 @@ package_group(
     name = "pkg_kubectl_cmd_create_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/edit",
     ],
 )
 
@@ -169,23 +170,56 @@ package_group(
         "//cmd/kubectl",
         "//cmd/kubectl/app",
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/annotate",
+        "//pkg/kubectl/cmd/apiresources",
+        "//pkg/kubectl/cmd/apply",
+        "//pkg/kubectl/cmd/attach",
         "//pkg/kubectl/cmd/auth",
+        "//pkg/kubectl/cmd/autoscale",
+        "//pkg/kubectl/cmd/certificates",
+        "//pkg/kubectl/cmd/clusterinfo",
+        "//pkg/kubectl/cmd/completion",
         "//pkg/kubectl/cmd/config",
+        "//pkg/kubectl/cmd/convert",
+        "//pkg/kubectl/cmd/cp",
         "//pkg/kubectl/cmd/create",
+        "//pkg/kubectl/cmd/delete",
+        "//pkg/kubectl/cmd/describe",
+        "//pkg/kubectl/cmd/diff",
+        "//pkg/kubectl/cmd/drain",
+        "//pkg/kubectl/cmd/edit",
+        "//pkg/kubectl/cmd/exec",
+        "//pkg/kubectl/cmd/explain",
+        "//pkg/kubectl/cmd/expose",
         "//pkg/kubectl/cmd/get",
+        "//pkg/kubectl/cmd/help",
+        "//pkg/kubectl/cmd/label",
+        "//pkg/kubectl/cmd/logs",
+        "//pkg/kubectl/cmd/options",
+        "//pkg/kubectl/cmd/patch",
+        "//pkg/kubectl/cmd/plugin",
+        "//pkg/kubectl/cmd/portforward",
+        "//pkg/kubectl/cmd/proxy",
+        "//pkg/kubectl/cmd/replace",
+        "//pkg/kubectl/cmd/rollingupdate",
         "//pkg/kubectl/cmd/rollout",
+        "//pkg/kubectl/cmd/run",
+        "//pkg/kubectl/cmd/scale",
         "//pkg/kubectl/cmd/set",
+        "//pkg/kubectl/cmd/taint",
         "//pkg/kubectl/cmd/templates",
+        "//pkg/kubectl/cmd/top",
         "//pkg/kubectl/cmd/util",
         "//pkg/kubectl/cmd/util/sanity",
+        "//pkg/kubectl/cmd/version",
         "//pkg/kubectl/cmd/wait",
     ],
 )
 
 package_group(
-    name = "pkg_kubectl_cmd_testdata_edit_CONSUMERS",
+    name = "pkg_kubectl_cmd_edit_testdata_CONSUMERS",
     packages = [
-        "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/edit",
     ],
 )
 
@@ -193,12 +227,33 @@ package_group(
     name = "pkg_kubectl_cmd_testing_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/annotate",
+        "//pkg/kubectl/cmd/apply",
+        "//pkg/kubectl/cmd/attach",
         "//pkg/kubectl/cmd/auth",
+        "//pkg/kubectl/cmd/clusterinfo",
+        "//pkg/kubectl/cmd/convert",
+        "//pkg/kubectl/cmd/cp",
         "//pkg/kubectl/cmd/create",
+        "//pkg/kubectl/cmd/delete",
+        "//pkg/kubectl/cmd/describe",
+        "//pkg/kubectl/cmd/drain",
+        "//pkg/kubectl/cmd/edit",
+        "//pkg/kubectl/cmd/exec",
+        "//pkg/kubectl/cmd/expose",
         "//pkg/kubectl/cmd/get",
+        "//pkg/kubectl/cmd/label",
+        "//pkg/kubectl/cmd/logs",
+        "//pkg/kubectl/cmd/patch",
+        "//pkg/kubectl/cmd/portforward",
+        "//pkg/kubectl/cmd/replace",
+        "//pkg/kubectl/cmd/rollingupdate",
         "//pkg/kubectl/cmd/rollout",
+        "//pkg/kubectl/cmd/run",
         "//pkg/kubectl/cmd/set",
-        "//pkg/kubectl/cmd/wait",
+        "//pkg/kubectl/cmd/taint",
+        "//pkg/kubectl/cmd/testing",
+        "//pkg/kubectl/cmd/top",
         "//pkg/kubectl/explain",
     ],
 )
@@ -214,15 +269,48 @@ package_group(
         "//cmd/kubectl",
         "//cmd/kubectl/app",
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/annotate",
+        "//pkg/kubectl/cmd/apiresources",
+        "//pkg/kubectl/cmd/apply",
+        "//pkg/kubectl/cmd/attach",
         "//pkg/kubectl/cmd/auth",
+        "//pkg/kubectl/cmd/autoscale",
+        "//pkg/kubectl/cmd/certificates",
+        "//pkg/kubectl/cmd/clusterinfo",
+        "//pkg/kubectl/cmd/completion",
         "//pkg/kubectl/cmd/config",
+        "//pkg/kubectl/cmd/convert",
+        "//pkg/kubectl/cmd/cp",
         "//pkg/kubectl/cmd/create",
+        "//pkg/kubectl/cmd/delete",
+        "//pkg/kubectl/cmd/describe",
+        "//pkg/kubectl/cmd/diff",
+        "//pkg/kubectl/cmd/drain",
+        "//pkg/kubectl/cmd/edit",
+        "//pkg/kubectl/cmd/exec",
+        "//pkg/kubectl/cmd/explain",
+        "//pkg/kubectl/cmd/expose",
         "//pkg/kubectl/cmd/get",
+        "//pkg/kubectl/cmd/help",
+        "//pkg/kubectl/cmd/label",
+        "//pkg/kubectl/cmd/logs",
+        "//pkg/kubectl/cmd/patch",
+        "//pkg/kubectl/cmd/plugin",
+        "//pkg/kubectl/cmd/portforward",
+        "//pkg/kubectl/cmd/proxy",
+        "//pkg/kubectl/cmd/replace",
+        "//pkg/kubectl/cmd/rollingupdate",
         "//pkg/kubectl/cmd/rollout",
+        "//pkg/kubectl/cmd/run",
+        "//pkg/kubectl/cmd/scale",
         "//pkg/kubectl/cmd/set",
+        "//pkg/kubectl/cmd/taint",
         "//pkg/kubectl/cmd/testing",
+        "//pkg/kubectl/cmd/top",
         "//pkg/kubectl/cmd/util",
         "//pkg/kubectl/cmd/util/editor",
+        "//pkg/kubectl/cmd/util/sanity",
+        "//pkg/kubectl/cmd/version",
         "//pkg/kubectl/cmd/wait",
     ],
 )
@@ -231,7 +319,9 @@ package_group(
     name = "pkg_kubectl_cmd_util_editor_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/apply",
         "//pkg/kubectl/cmd/create",
+        "//pkg/kubectl/cmd/edit",
         "//pkg/kubectl/cmd/util",
     ],
 )
@@ -262,6 +352,7 @@ package_group(
         "//cmd/kubectl/app",
         "//pkg/kubectl",
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/top",
     ],
 )
 
@@ -301,6 +392,9 @@ package_group(
     packages = [
         "//pkg/kubectl",
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/logs",
+        "//pkg/kubectl/cmd/portforward",
+        "//pkg/kubectl/cmd/rollingupdate",
         "//pkg/kubectl/proxy",
     ],
 )
@@ -310,9 +404,12 @@ package_group(
     packages = [
         "//pkg/kubectl",
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/apply",
+        "//pkg/kubectl/cmd/convert",
+        "//pkg/kubectl/cmd/replace",
+        "//pkg/kubectl/cmd/rollingupdate",
         "//pkg/kubectl/cmd/testing",
         "//pkg/kubectl/cmd/util",
-        "//pkg/kubectl/resource",
     ],
 )
 
diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD
index 3f60f1dd3b..23997cb116 100644
--- a/pkg/kubectl/cmd/BUILD
+++ b/pkg/kubectl/cmd/BUILD
@@ -73,8 +73,8 @@ go_test(
         "cmd_test.go",
     ],
     data = [
-        "testdata",
         "//api/openapi-spec:swagger-spec",
+        "//pkg/kubectl/cmd/plugin:testdata",
         "//test/e2e/testing-manifests:all-srcs",
         "//test/fixtures",
     ],
diff --git a/pkg/kubectl/cmd/annotate/BUILD b/pkg/kubectl/cmd/annotate/BUILD
index 27a66633bc..c1e273ca70 100644
--- a/pkg/kubectl/cmd/annotate/BUILD
+++ b/pkg/kubectl/cmd/annotate/BUILD
@@ -28,6 +28,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["annotate_test.go"],
+    data = [
+        "//test/e2e/testing-manifests:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/apply/BUILD b/pkg/kubectl/cmd/apply/BUILD
index 826d24b3be..a29c7e77e0 100644
--- a/pkg/kubectl/cmd/apply/BUILD
+++ b/pkg/kubectl/cmd/apply/BUILD
@@ -48,6 +48,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["apply_test.go"],
+    data = [
+        "//test/fixtures",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/convert/BUILD b/pkg/kubectl/cmd/convert/BUILD
index f16b0d005a..0a813bc572 100644
--- a/pkg/kubectl/cmd/convert/BUILD
+++ b/pkg/kubectl/cmd/convert/BUILD
@@ -25,6 +25,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["convert_test.go"],
+    data = [
+        "//test/fixtures",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/delete/BUILD b/pkg/kubectl/cmd/delete/BUILD
index d94795f9fa..e0e0cad7c9 100644
--- a/pkg/kubectl/cmd/delete/BUILD
+++ b/pkg/kubectl/cmd/delete/BUILD
@@ -29,6 +29,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["delete_test.go"],
+    data = [
+        "//test/e2e/testing-manifests:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/describe/BUILD b/pkg/kubectl/cmd/describe/BUILD
index 764bdc1a43..849fc5e2a5 100644
--- a/pkg/kubectl/cmd/describe/BUILD
+++ b/pkg/kubectl/cmd/describe/BUILD
@@ -23,6 +23,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["describe_test.go"],
+    data = [
+        "//test/e2e/testing-manifests:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/edit/BUILD b/pkg/kubectl/cmd/edit/BUILD
index deefeb5241..a8c9de0cd5 100644
--- a/pkg/kubectl/cmd/edit/BUILD
+++ b/pkg/kubectl/cmd/edit/BUILD
@@ -18,6 +18,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["edit_test.go"],
+    data = [
+        "//pkg/kubectl/cmd/edit/testdata:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/apply:go_default_library",
diff --git a/pkg/kubectl/cmd/edit/testdata/BUILD b/pkg/kubectl/cmd/edit/testdata/BUILD
index 26795a0565..6d03cb77a3 100644
--- a/pkg/kubectl/cmd/edit/testdata/BUILD
+++ b/pkg/kubectl/cmd/edit/testdata/BUILD
@@ -29,6 +29,6 @@ filegroup(
     srcs = [":package-srcs"],
     tags = ["automanaged"],
     visibility = [
-        "//build/visible_to:pkg_kubectl_cmd_testdata_edit_CONSUMERS",
+        "//build/visible_to:pkg_kubectl_cmd_edit_testdata_CONSUMERS",
     ],
 )
diff --git a/pkg/kubectl/cmd/expose/BUILD b/pkg/kubectl/cmd/expose/BUILD
index fc44129a59..b2f0cb362e 100644
--- a/pkg/kubectl/cmd/expose/BUILD
+++ b/pkg/kubectl/cmd/expose/BUILD
@@ -30,6 +30,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["expose_test.go"],
+    data = [
+        "//test/e2e/testing-manifests:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/label/BUILD b/pkg/kubectl/cmd/label/BUILD
index 6b1b98c65b..83fb5493c1 100644
--- a/pkg/kubectl/cmd/label/BUILD
+++ b/pkg/kubectl/cmd/label/BUILD
@@ -30,6 +30,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["label_test.go"],
+    data = [
+        "//test/e2e/testing-manifests:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/patch/BUILD b/pkg/kubectl/cmd/patch/BUILD
index 7059ceba73..7019975e1f 100644
--- a/pkg/kubectl/cmd/patch/BUILD
+++ b/pkg/kubectl/cmd/patch/BUILD
@@ -30,6 +30,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["patch_test.go"],
+    data = [
+        "//test/e2e/testing-manifests:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",
diff --git a/pkg/kubectl/cmd/plugin/BUILD b/pkg/kubectl/cmd/plugin/BUILD
index 3a6c1a3487..6f4a157e5d 100644
--- a/pkg/kubectl/cmd/plugin/BUILD
+++ b/pkg/kubectl/cmd/plugin/BUILD
@@ -28,3 +28,9 @@ filegroup(
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )
+
+filegroup(
+    name = "testdata",
+    data = glob(["testdata/**"]),
+    visibility = ["//visibility:public"],
+)
diff --git a/pkg/kubectl/cmd/replace/BUILD b/pkg/kubectl/cmd/replace/BUILD
index ef6dfa276f..29b0d9d6bd 100644
--- a/pkg/kubectl/cmd/replace/BUILD
+++ b/pkg/kubectl/cmd/replace/BUILD
@@ -26,6 +26,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["replace_test.go"],
+    data = [
+        "//test/e2e/testing-manifests:all-srcs",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubectl/cmd/testing:go_default_library",