diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt
index 10ec6077e08..a1b79a138ff 100755
--- a/test/conformance/testdata/conformance.txt
+++ b/test/conformance/testdata/conformance.txt
@@ -108,7 +108,6 @@ test/e2e/common/secrets_volume.go: "should be consumable from pods in volume wit
 test/e2e/common/secrets_volume.go: "should be consumable from pods in volume with mappings and Item Mode set "
 test/e2e/common/secrets_volume.go: "should be consumable in multiple volumes in a pod "
 test/e2e/common/secrets_volume.go: "optional updates should be reflected in volume "
-test/e2e/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running "
 test/e2e/kubectl/kubectl.go: "should create and stop a replication controller "
 test/e2e/kubectl/kubectl.go: "should scale a replication controller "
 test/e2e/kubectl/kubectl.go: "should do a rolling update of a replication controller "
@@ -142,9 +141,10 @@ test/e2e/network/service.go: "should provide secure master service "
 test/e2e/network/service.go: "should serve a basic endpoint from pods "
 test/e2e/network/service.go: "should serve multiport endpoints from pods "
 test/e2e/network/service_latency.go: "should not be very high "
-test/e2e/pods.go: "should be submitted and removed  [Flaky]"
-test/e2e/pods.go: "should be submitted and removed "
-test/e2e/pre_stop.go: "should call prestop when killing a pod "
+test/e2e/node/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running "
+test/e2e/node/pods.go: "should be submitted and removed  [Flaky]"
+test/e2e/node/pods.go: "should be submitted and removed "
+test/e2e/node/pre_stop.go: "should call prestop when killing a pod "
 test/e2e/scheduling/predicates.go: "validates resource limits of pods that are allowed to run "
 test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if not matching "
 test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if matching "
diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index db510d85166..8210ef377f7 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -38,14 +38,9 @@ go_library(
     name = "go_default_library",
     srcs = [
         "e2e.go",
-        "events.go",
         "examples.go",
         "gke_local_ssd.go",
         "gke_node_pools.go",
-        "pod_gc.go",
-        "pods.go",
-        "pre_stop.go",
-        "ssh.go",
     ],
     importpath = "k8s.io/kubernetes/test/e2e",
     deps = [
@@ -62,7 +57,6 @@ go_library(
         "//test/e2e/generated:go_default_library",
         "//test/e2e/manifest:go_default_library",
         "//test/utils:go_default_library",
-        "//test/utils/image:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/ginkgo/config:go_default_library",
@@ -70,15 +64,12 @@ go_library(
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
     ],
diff --git a/test/e2e/node/BUILD b/test/e2e/node/BUILD
index b1a2c719cf7..b8db42fbe08 100644
--- a/test/e2e/node/BUILD
+++ b/test/e2e/node/BUILD
@@ -4,10 +4,15 @@ go_library(
     name = "go_default_library",
     srcs = [
         "apparmor.go",
+        "events.go",
         "framework.go",
         "kubelet.go",
         "kubelet_perf.go",
+        "pod_gc.go",
+        "pods.go",
+        "pre_stop.go",
         "security_context.go",
+        "ssh.go",
     ],
     importpath = "k8s.io/kubernetes/test/e2e/node",
     visibility = ["//visibility:public"],
@@ -17,13 +22,18 @@ go_library(
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/utils:go_default_library",
+        "//test/utils/image:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
     ],
 )