diff --git a/pkg/util/BUILD.bazel b/pkg/util/BUILD.bazel
index d204a51cf..244b82432 100644
--- a/pkg/util/BUILD.bazel
+++ b/pkg/util/BUILD.bazel
@@ -4,8 +4,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "context.go",
-        "filter.go",
-        "useragent_roundtripper.go",
+        "useragent.go",
         "util.go",
         "version.go",
     ],
@@ -20,10 +19,7 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "filter_test.go",
-        "util_test.go",
-    ],
+    srcs = ["util_test.go"],
     embed = [":go_default_library"],
 )
 
diff --git a/pkg/util/kube/BUILD.bazel b/pkg/util/kube/BUILD.bazel
index 150b09b31..ef8500260 100644
--- a/pkg/util/kube/BUILD.bazel
+++ b/pkg/util/kube/BUILD.bazel
@@ -4,7 +4,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "config.go",
-        "ensure.go",
         "pki.go",
     ],
     importpath = "github.com/jetstack/cert-manager/pkg/util/kube",
@@ -13,11 +12,7 @@ go_library(
         "//pkg/util:go_default_library",
         "//pkg/util/errors:go_default_library",
         "//pkg/util/pki:go_default_library",
-        "//vendor/k8s.io/api/batch/v1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/listers/core/v1:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
diff --git a/pkg/util/pki/BUILD.bazel b/pkg/util/pki/BUILD.bazel
index 9806f0e57..5936b0526 100644
--- a/pkg/util/pki/BUILD.bazel
+++ b/pkg/util/pki/BUILD.bazel
@@ -11,7 +11,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/certmanager/v1alpha1:go_default_library",
-        "//pkg/util:go_default_library",
         "//pkg/util/errors:go_default_library",
     ],
 )
@@ -24,7 +23,10 @@ go_test(
         "parse_test.go",
     ],
     embed = [":go_default_library"],
-    deps = ["//pkg/apis/certmanager/v1alpha1:go_default_library"],
+    deps = [
+        "//pkg/apis/certmanager/v1alpha1:go_default_library",
+        "//pkg/util:go_default_library",
+    ],
 )
 
 filegroup(