diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 910a1ee3..eff5a1a8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -372,103 +372,103 @@
     },
     {
       "ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1beta2",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/authentication/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/authentication/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/authorization/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/authorization/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/autoscaling/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/autoscaling/v2alpha1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/batch/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/batch/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/batch/v2alpha1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/certificates/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/core/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/extensions/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/networking/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/policy/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1alpha1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/scheduling/v1alpha1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/settings/v1alpha1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/storage/v1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/api/storage/v1beta1",
-      "Rev": "b4c1dde74617eb5b4db9a7db95b75ecb8bf2b54f"
+      "Rev": "2ee411bc5b2481d94ab1ce278ba13d3565927efb"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
diff --git a/discovery/fake/BUILD b/discovery/fake/BUILD
index f4ef7d21..b467202e 100644
--- a/discovery/fake/BUILD
+++ b/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/discovery/fake/test/discovery_test.go b/discovery/fake/discovery_test.go
similarity index 98%
rename from discovery/fake/test/discovery_test.go
rename to discovery/fake/discovery_test.go
index 816f6a74..cfdcf1a2 100644
--- a/discovery/fake/test/discovery_test.go
+++ b/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/discovery/fake/test/BUILD b/discovery/fake/test/BUILD
deleted file mode 100644
index eb19f919..00000000
--- a/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"],
-)