diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index dd9aaaf4050..b56250e78a4 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -14,12 +14,6 @@ go_library(
         "addon_update.go",
         "apparmor.go",
         "cadvisor.go",
-        "cluster_logging_es.go",
-        "cluster_logging_es_utils.go",
-        "cluster_logging_gcl.go",
-        "cluster_logging_gcl_load.go",
-        "cluster_logging_gcl_utils.go",
-        "cluster_logging_utils.go",
         "cluster_size_autoscaling.go",
         "cluster_upgrade.go",
         "cronjob.go",
@@ -172,9 +166,7 @@ go_library(
         "//vendor:golang.org/x/crypto/ssh",
         "//vendor:golang.org/x/net/context",
         "//vendor:golang.org/x/net/websocket",
-        "//vendor:golang.org/x/oauth2/google",
         "//vendor:google.golang.org/api/googleapi",
-        "//vendor:google.golang.org/api/logging/v2beta1",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
@@ -201,7 +193,6 @@ go_library(
         "//vendor:k8s.io/client-go/rest",
         "//vendor:k8s.io/client-go/tools/cache",
         "//vendor:k8s.io/client-go/util/flowcontrol",
-        "//vendor:k8s.io/client-go/util/integer",
     ],
 )
 
@@ -221,6 +212,7 @@ go_test(
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/metrics:go_default_library",
+        "//test/e2e/cluster-logging:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/perf:go_default_library",
         "//test/e2e/scheduling:go_default_library",
@@ -257,6 +249,7 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//test/e2e/chaosmonkey:all-srcs",
+        "//test/e2e/cluster-logging:all-srcs",
         "//test/e2e/common:all-srcs",
         "//test/e2e/framework:all-srcs",
         "//test/e2e/generated:all-srcs",
diff --git a/test/e2e/cluster-logging/BUILD b/test/e2e/cluster-logging/BUILD
new file mode 100644
index 00000000000..94f52edbc6c
--- /dev/null
+++ b/test/e2e/cluster-logging/BUILD
@@ -0,0 +1,49 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "es.go",
+        "es_utils.go",
+        "sd.go",
+        "sd_load.go",
+        "sd_utils.go",
+        "utils.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/api/v1:go_default_library",
+        "//test/e2e/framework:go_default_library",
+        "//vendor:github.com/onsi/ginkgo",
+        "//vendor:github.com/onsi/gomega",
+        "//vendor:golang.org/x/net/context",
+        "//vendor:golang.org/x/oauth2/google",
+        "//vendor:google.golang.org/api/logging/v2beta1",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
+        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
+        "//vendor:k8s.io/apimachinery/pkg/fields",
+        "//vendor:k8s.io/apimachinery/pkg/labels",
+        "//vendor:k8s.io/client-go/util/integer",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)
diff --git a/test/e2e/cluster-logging/OWNERS b/test/e2e/cluster-logging/OWNERS
new file mode 100644
index 00000000000..445cfe217a1
--- /dev/null
+++ b/test/e2e/cluster-logging/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - piosz
+  - crassirostris
+approvers:
+  - piosz
+  - crassirostris
diff --git a/test/e2e/cluster_logging_es.go b/test/e2e/cluster-logging/es.go
similarity index 100%
rename from test/e2e/cluster_logging_es.go
rename to test/e2e/cluster-logging/es.go
diff --git a/test/e2e/cluster_logging_es_utils.go b/test/e2e/cluster-logging/es_utils.go
similarity index 100%
rename from test/e2e/cluster_logging_es_utils.go
rename to test/e2e/cluster-logging/es_utils.go
diff --git a/test/e2e/cluster_logging_gcl.go b/test/e2e/cluster-logging/sd.go
similarity index 100%
rename from test/e2e/cluster_logging_gcl.go
rename to test/e2e/cluster-logging/sd.go
diff --git a/test/e2e/cluster_logging_gcl_load.go b/test/e2e/cluster-logging/sd_load.go
similarity index 100%
rename from test/e2e/cluster_logging_gcl_load.go
rename to test/e2e/cluster-logging/sd_load.go
diff --git a/test/e2e/cluster_logging_gcl_utils.go b/test/e2e/cluster-logging/sd_utils.go
similarity index 100%
rename from test/e2e/cluster_logging_gcl_utils.go
rename to test/e2e/cluster-logging/sd_utils.go
diff --git a/test/e2e/cluster_logging_utils.go b/test/e2e/cluster-logging/utils.go
similarity index 100%
rename from test/e2e/cluster_logging_utils.go
rename to test/e2e/cluster-logging/utils.go
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 92965d81efb..6593142a2c4 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -19,6 +19,7 @@ package e2e
 import (
 	"testing"
 
+	_ "k8s.io/kubernetes/test/e2e/cluster-logging"
 	"k8s.io/kubernetes/test/e2e/framework"
 	_ "k8s.io/kubernetes/test/e2e/perf"
 	_ "k8s.io/kubernetes/test/e2e/scheduling"