diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/README b/staging/src/k8s.io/kube-gen/test/apis/README
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/README
rename to staging/src/k8s.io/kube-gen/test/apis/README
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/BUILD b/staging/src/k8s.io/kube-gen/test/apis/testgroup/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/BUILD
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/doc.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/doc.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/doc.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/doc.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/BUILD b/staging/src/k8s.io/kube-gen/test/apis/testgroup/install/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/BUILD
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/install/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/install.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/install/install.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/install.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/install/install.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/register.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/register.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/register.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/register.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/types.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/types.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/types.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/types.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/BUILD b/staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/BUILD
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/doc.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/doc.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/doc.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/doc.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/register.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/register.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/register.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/register.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/types.generated.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/types.generated.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/types.generated.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/types.generated.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/types.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/types.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/types.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/types.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/zz_generated.deepcopy.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/v1/zz_generated.deepcopy.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/zz_generated.deepcopy.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/zz_generated.deepcopy.go
rename to staging/src/k8s.io/kube-gen/test/apis/testgroup/zz_generated.deepcopy.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD b/staging/src/k8s.io/kube-gen/test/clientset/internal/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset_test.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset_test.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/clientset_test.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/doc.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/doc.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/doc.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/doc.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/fake/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/clientset_generated.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/fake/clientset_generated.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/doc.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/doc.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/doc.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/fake/doc.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/register.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/register.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/register.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/fake/register.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD b/staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/doc.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/doc.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/doc.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/doc.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/register.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/register.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/doc.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/doc.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/doc.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/doc.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/BUILD
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/BUILD
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/doc.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/doc.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/doc.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/doc.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/generated_expansion.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/generated_expansion.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/generated_expansion.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/generated_expansion.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testtype.go
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go
rename to staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testtype.go