diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD
index 016820c19b3..7cb81e90690 100644
--- a/pkg/kubelet/cm/BUILD
+++ b/pkg/kubelet/cm/BUILD
@@ -166,7 +166,7 @@ filegroup(
         "//pkg/kubelet/cm/cpumanager:all-srcs",
         "//pkg/kubelet/cm/cpuset:all-srcs",
         "//pkg/kubelet/cm/devicemanager:all-srcs",
-        "//pkg/kubelet/cm/topologymanager:all-srcs",
+        "//pkg/kubelet/cm/topologymanager/socketmask:all-srcs",
         "//pkg/kubelet/cm/util:all-srcs",
     ],
     tags = ["automanaged"],
diff --git a/pkg/kubelet/cm/topologymanager/BUILD b/pkg/kubelet/cm/topologymanager/BUILD
deleted file mode 100644
index cfb40449b3b..00000000000
--- a/pkg/kubelet/cm/topologymanager/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = ["socketmask_test.go"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//pkg/kubelet/cm/topologymanager/socketmask:all-srcs",
-    ],
-    tags = ["automanaged"],
-    visibility = ["//visibility:public"],
-)
diff --git a/pkg/kubelet/cm/topologymanager/socketmask/BUILD b/pkg/kubelet/cm/topologymanager/socketmask/BUILD
index 33791a89bb3..0e49d414b8c 100644
--- a/pkg/kubelet/cm/topologymanager/socketmask/BUILD
+++ b/pkg/kubelet/cm/topologymanager/socketmask/BUILD
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
@@ -21,3 +21,9 @@ filegroup(
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )
+
+go_test(
+    name = "go_default_test",
+    srcs = ["socketmask_test.go"],
+    embed = [":go_default_library"],
+)
diff --git a/pkg/kubelet/cm/topologymanager/socketmask_test.go b/pkg/kubelet/cm/topologymanager/socketmask/socketmask_test.go
similarity index 100%
rename from pkg/kubelet/cm/topologymanager/socketmask_test.go
rename to pkg/kubelet/cm/topologymanager/socketmask/socketmask_test.go