diff --git a/MantleAPI/BUILD.bazel b/MantleAPI/BUILD.bazel
index 54b5d534ac46b3cfa452c404d6fcf197617294f1..bad6950718cbfea57c525bab22c68b457710fbe7 100644
--- a/MantleAPI/BUILD.bazel
+++ b/MantleAPI/BUILD.bazel
@@ -10,31 +10,17 @@
 
 cc_library(
     name = "mantle_api",
-    hdrs = glob([
-        "include/**/*.h",
-    ]),
-    includes = [
-        "include",
-    ],
-    visibility = [
-        "//visibility:public",
-    ],
-    deps = [
-        "@units",
-    ],
+    hdrs = glob(["include/**/*.h"]),
+    includes = ["include"],
+    visibility = ["//visibility:public"],
+    deps = ["@units"],
 )
 
 cc_library(
-    name = "mantle_api_test_utils",
-    hdrs = glob([
-        "test/**/*.h",
-    ]),
-    includes = [
-        "test",
-    ],
-    visibility = [
-        "//visibility:public",
-    ],
+    name = "test_utils",
+    hdrs = ["test/MantleAPI/Test/test_utils.h"],
+    includes = ["test"],
+    visibility = ["//visibility:public"],
     deps = [
         ":mantle_api",
         "@googletest//:gtest_main",
@@ -42,14 +28,8 @@ cc_library(
 )
 
 cc_test(
-    name = "mantle_api_test",
+    name = "interface_test",
     timeout = "short",
     srcs = ["test/interface_test.cpp"],
-    data = [
-        "//Core/Service/Testing:sanitizer-suppressions",
-    ],
-    tags = ["test"],
-    deps = [
-        ":mantle_api_test_utils",
-    ],
+    deps = [":test_utils"],
 )