diff --git a/hack/.golint_failures b/hack/.golint_failures
index ccc9b4793be..d73c3779a5b 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -673,7 +673,6 @@ staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/tokentest
 staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
 staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook
 staging/src/k8s.io/client-go/discovery/cached
-staging/src/k8s.io/client-go/discovery/fake
 staging/src/k8s.io/client-go/dynamic
 staging/src/k8s.io/client-go/dynamic/fake
 staging/src/k8s.io/client-go/examples/workqueue
diff --git a/staging/src/k8s.io/client-go/discovery/fake/BUILD b/staging/src/k8s.io/client-go/discovery/fake/BUILD
index f4ef7d219aa..b467202e845 100644
--- a/staging/src/k8s.io/client-go/discovery/fake/BUILD
+++ b/staging/src/k8s.io/client-go/discovery/fake/BUILD
@@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
 load(
     "@io_bazel_rules_go//go:def.bzl",
     "go_library",
+    "go_test",
 )
 
 go_library(
@@ -30,9 +31,16 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//staging/src/k8s.io/client-go/discovery/fake/test:all-srcs",
-    ],
+    srcs = [":package-srcs"],
     tags = ["automanaged"],
 )
+
+go_test(
+    name = "go_default_xtest",
+    srcs = ["discovery_test.go"],
+    deps = [
+        "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
+        "//vendor/k8s.io/client-go/discovery/fake:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
+    ],
+)
diff --git a/staging/src/k8s.io/client-go/discovery/fake/test/discovery_test.go b/staging/src/k8s.io/client-go/discovery/fake/discovery_test.go
similarity index 98%
rename from staging/src/k8s.io/client-go/discovery/fake/test/discovery_test.go
rename to staging/src/k8s.io/client-go/discovery/fake/discovery_test.go
index 816f6a7404a..cfdcf1a23df 100644
--- a/staging/src/k8s.io/client-go/discovery/fake/test/discovery_test.go
+++ b/staging/src/k8s.io/client-go/discovery/fake/discovery_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package fake
+package fake_test
 
 import (
 	"testing"
diff --git a/staging/src/k8s.io/client-go/discovery/fake/test/BUILD b/staging/src/k8s.io/client-go/discovery/fake/test/BUILD
deleted file mode 100644
index eb19f919f87..00000000000
--- a/staging/src/k8s.io/client-go/discovery/fake/test/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = ["discovery_test.go"],
-    deps = [
-        "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
-        "//vendor/k8s.io/client-go/discovery/fake:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-    visibility = ["//visibility:public"],
-)