diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD
index 4bac239e5dd..e7c8b1f3d0f 100644
--- a/pkg/kubectl/BUILD
+++ b/pkg/kubectl/BUILD
@@ -42,7 +42,6 @@ go_library(
     srcs = [
         "conditions.go",
         "doc.go",
-        "interfaces.go",
         "rolling_updater.go",
         "scale.go",
     ],
@@ -55,12 +54,10 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
-        "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/scale:go_default_library",
         "//staging/src/k8s.io/client-go/util/retry:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util:go_default_library",
diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD
index d7e64f9f760..3be364d3c9d 100644
--- a/pkg/kubectl/cmd/testing/BUILD
+++ b/pkg/kubectl/cmd/testing/BUILD
@@ -4,13 +4,13 @@ go_library(
     name = "go_default_library",
     srcs = [
         "fake.go",
+        "interfaces.go",
         "util.go",
         "zz_generated.deepcopy.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/testing",
     visibility = ["//build/visible_to:pkg_kubectl_cmd_testing_CONSUMERS"],
     deps = [
-        "//pkg/kubectl:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/meta/testrestmapper:go_default_library",
@@ -18,6 +18,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
         "//staging/src/k8s.io/client-go/discovery:go_default_library",
diff --git a/pkg/kubectl/cmd/testing/fake.go b/pkg/kubectl/cmd/testing/fake.go
index ced8dbf35bf..ac8b5edda6b 100644
--- a/pkg/kubectl/cmd/testing/fake.go
+++ b/pkg/kubectl/cmd/testing/fake.go
@@ -49,7 +49,6 @@ import (
 	"k8s.io/kubectl/pkg/util/openapi"
 	openapitesting "k8s.io/kubectl/pkg/util/openapi/testing"
 	"k8s.io/kubectl/pkg/validation"
-	"k8s.io/kubernetes/pkg/kubectl"
 )
 
 // InternalType is the schema for internal type
@@ -284,9 +283,9 @@ type TestFactory struct {
 
 	kubeConfigFlags *genericclioptions.TestConfigFlags
 
-	Client             kubectl.RESTClient
+	Client             RESTClient
 	ScaleGetter        scaleclient.ScalesGetter
-	UnstructuredClient kubectl.RESTClient
+	UnstructuredClient RESTClient
 	ClientConfigVal    *restclient.Config
 	FakeDynamicClient  *fakedynamic.FakeDynamicClient
 
diff --git a/pkg/kubectl/interfaces.go b/pkg/kubectl/cmd/testing/interfaces.go
similarity index 98%
rename from pkg/kubectl/interfaces.go
rename to pkg/kubectl/cmd/testing/interfaces.go
index de20a5d77b7..efb6a65de06 100644
--- a/pkg/kubectl/interfaces.go
+++ b/pkg/kubectl/cmd/testing/interfaces.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubectl
+package testing
 
 import (
 	"k8s.io/apimachinery/pkg/types"