diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD
index 06c05f9545f..6a05f647318 100644
--- a/test/e2e_node/BUILD
+++ b/test/e2e_node/BUILD
@@ -10,11 +10,9 @@ go_library(
     name = "go_default_library",
     srcs = [
         "benchmark_util.go",
-        "device_plugin.go",
         "doc.go",
         "docker_util.go",
         "framework.go",
-        "gpu_device_plugin.go",
         "image_list.go",
         "node_problem_detector_linux.go",
         "resource_collector.go",
@@ -37,10 +35,8 @@ go_library(
         "//pkg/kubelet/util:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
         "//staging/src/k8s.io/component-base/featuregate:go_default_library",
@@ -49,12 +45,9 @@ go_library(
         "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library",
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
-        "//test/e2e/framework/deviceplugin:go_default_library",
         "//test/e2e/framework/gpu:go_default_library",
         "//test/e2e/framework/log:go_default_library",
         "//test/e2e/framework/metrics:go_default_library",
-        "//test/e2e/framework/node:go_default_library",
-        "//test/e2e/framework/pod:go_default_library",
         "//test/utils/image:go_default_library",
         "//vendor/github.com/blang/semver:go_default_library",
         "//vendor/github.com/coreos/go-systemd/util:go_default_library",
@@ -62,7 +55,6 @@ go_library(
         "//vendor/github.com/docker/docker/client:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
-        "//vendor/github.com/prometheus/common/model:go_default_library",
         "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
     ] + select({
@@ -73,11 +65,13 @@ go_library(
             "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
+            "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
             "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
             "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
             "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
             "//test/e2e/framework/kubelet:go_default_library",
             "//test/e2e/framework/perf:go_default_library",
+            "//test/e2e/framework/pod:go_default_library",
             "//test/e2e/perftype:go_default_library",
             "//test/e2e_node/perftype:go_default_library",
             "//test/utils:go_default_library",
@@ -98,6 +92,7 @@ go_test(
         "cpu_manager_test.go",
         "critical_pod_test.go",
         "density_test.go",
+        "device_plugin_test.go",
         "docker_test.go",
         "dockershim_checkpoint_test.go",
         "dynamic_kubelet_config_test.go",
@@ -105,6 +100,7 @@ go_test(
         "eviction_test.go",
         "garbage_collector_test.go",
         "gke_environment_test.go",
+        "gpu_device_plugin_test.go",
         "hugepages_test.go",
         "image_id_test.go",
         "log_path_test.go",
@@ -131,6 +127,7 @@ go_test(
         "//pkg/features:go_default_library",
         "//pkg/kubelet:go_default_library",
         "//pkg/kubelet/apis/config:go_default_library",
+        "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library",
         "//pkg/kubelet/apis/resourcemetrics/v1alpha1:go_default_library",
         "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
@@ -169,8 +166,11 @@ go_test(
         "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
+        "//test/e2e/framework/deviceplugin:go_default_library",
+        "//test/e2e/framework/gpu:go_default_library",
         "//test/e2e/framework/log:go_default_library",
         "//test/e2e/framework/metrics:go_default_library",
+        "//test/e2e/framework/node:go_default_library",
         "//test/e2e/framework/pod:go_default_library",
         "//test/e2e/framework/volume:go_default_library",
         "//test/e2e_node/perf/workloads:go_default_library",
diff --git a/test/e2e_node/device_plugin.go b/test/e2e_node/device_plugin_test.go
similarity index 100%
rename from test/e2e_node/device_plugin.go
rename to test/e2e_node/device_plugin_test.go
diff --git a/test/e2e_node/gpu_device_plugin.go b/test/e2e_node/gpu_device_plugin_test.go
similarity index 100%
rename from test/e2e_node/gpu_device_plugin.go
rename to test/e2e_node/gpu_device_plugin_test.go