diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ee14515c..eb1459ba 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,6 +19,7 @@ on:
     types: [checks_requested]
 jobs:
   test:
+    name: "Run tests"
     uses: eclipse-score/cicd-workflows/.github/workflows/tests.yml@main
     permissions:
       contents: read
diff --git a/BUILD b/BUILD
index 38e53208..ec623137 100644
--- a/BUILD
+++ b/BUILD
@@ -25,7 +25,6 @@ copyright_checker(
     srcs = [
         "examples",
         "src",
-        "tests",
         "//:BUILD",
         "//:MODULE.bazel",
     ],
diff --git a/src/launch_manager_daemon/BUILD b/src/launch_manager_daemon/BUILD
index eb69e23f..a18d5545 100644
--- a/src/launch_manager_daemon/BUILD
+++ b/src/launch_manager_daemon/BUILD
@@ -54,6 +54,7 @@ cc_binary_with_common_opts(
 
 cc_library(
     name = "headers",
+    testonly = True,
     hdrs = glob(
         [
             "src/**/*.h",
@@ -65,7 +66,6 @@ cc_library(
         "include",
         "src",
     ],
-    visibility = ["//tests:__subpackages__"],
     deps = [
         # Must match launch_manager deps
         ":config",
diff --git a/src/launch_manager_daemon/process_state_client_lib/BUILD b/src/launch_manager_daemon/process_state_client_lib/BUILD
index 117e53de..3d6d3ac5 100644
--- a/src/launch_manager_daemon/process_state_client_lib/BUILD
+++ b/src/launch_manager_daemon/process_state_client_lib/BUILD
@@ -10,8 +10,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
-package(default_visibility = ["//tests:__subpackages__"])
-
 cc_library(
     name = "process_state_client",
     srcs = [
@@ -40,6 +38,7 @@ cc_library(
 
 cc_library(
     name = "headers",
+    testonly = True,
     hdrs = glob(
         [
             "include/score/lcm/**/*.h",
@@ -51,7 +50,6 @@ cc_library(
         "include",
         "src",
     ],
-    visibility = ["//tests:__subpackages__"],
     deps = [
         # Must match process_state_client deps
         "//externals/ipc_dropin",
@@ -63,3 +61,16 @@ cc_library(
         "@score_baselibs//score/result",
     ],
 )
+
+cc_test(
+    name = "processstateclient_UT",
+    srcs = [
+        "src/processstateclient_UT.cpp",
+        "//src/launch_manager_daemon/process_state_client_lib:src/processstatenotifier.cpp",
+        "//src/launch_manager_daemon/process_state_client_lib:src/processstatereceiver.cpp",
+    ],
+    deps = [
+        "//src/launch_manager_daemon/process_state_client_lib:headers",
+        "@googletest//:gtest_main",
+    ],
+)
diff --git a/tests/ut/processstateclient_UT/processstateclient_UT.cpp b/src/launch_manager_daemon/process_state_client_lib/src/processstateclient_UT.cpp
similarity index 100%
rename from tests/ut/processstateclient_UT/processstateclient_UT.cpp
rename to src/launch_manager_daemon/process_state_client_lib/src/processstateclient_UT.cpp
diff --git a/tests/ut/BUILD b/tests/ut/BUILD
deleted file mode 100644
index 7997e0ea..00000000
--- a/tests/ut/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# *******************************************************************************
-# Copyright (c) 2026 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Apache License Version 2.0 which is available at
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# SPDX-License-Identifier: Apache-2.0
-# *******************************************************************************
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-# Define mock cc libraries here if needed
diff --git a/tests/ut/processstateclient_UT/BUILD b/tests/ut/processstateclient_UT/BUILD
deleted file mode 100644
index 1eece866..00000000
--- a/tests/ut/processstateclient_UT/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# *******************************************************************************
-# Copyright (c) 2026 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Apache License Version 2.0 which is available at
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# SPDX-License-Identifier: Apache-2.0
-# *******************************************************************************
-cc_test(
-    name = "processstateclient_UT",
-    srcs = [
-        "processstateclient_UT.cpp",
-        "//src/launch_manager_daemon/process_state_client_lib:src/processstatenotifier.cpp",
-        "//src/launch_manager_daemon/process_state_client_lib:src/processstatereceiver.cpp",
-    ],
-    visibility = ["//tests:__subpackages__"],
-    deps = [
-        "//src/launch_manager_daemon/process_state_client_lib:headers",
-        "@googletest//:gtest_main",
-    ],
-)