diff --git a/documentapi/CMakeLists.txt b/documentapi/CMakeLists.txt
index 53a9fce06782..584481f43c70 100644
--- a/documentapi/CMakeLists.txt
+++ b/documentapi/CMakeLists.txt
@@ -18,7 +18,7 @@ vespa_define_module(
     src/vespa/documentapi/messagebus/policies
 
     TEST_DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 
     TESTS
     src/tests/messagebus
diff --git a/messagebus/src/tests/advancedrouting/CMakeLists.txt b/messagebus/src/tests/advancedrouting/CMakeLists.txt
index df69125c46c3..38edf80eee9a 100644
--- a/messagebus/src/tests/advancedrouting/CMakeLists.txt
+++ b/messagebus/src/tests/advancedrouting/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_advancedrouting_test_app TEST
     SOURCES
     advancedrouting.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/auto-reply/CMakeLists.txt b/messagebus/src/tests/auto-reply/CMakeLists.txt
index 8ef5ccb59838..b715379bf5e4 100644
--- a/messagebus/src/tests/auto-reply/CMakeLists.txt
+++ b/messagebus/src/tests/auto-reply/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_auto-reply_test_app TEST
     SOURCES
     auto-reply.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_auto-reply_test_app COMMAND messagebus_auto-reply_test_app)
diff --git a/messagebus/src/tests/blob/CMakeLists.txt b/messagebus/src/tests/blob/CMakeLists.txt
index 6232ff1314a7..f7b7fef16dc6 100644
--- a/messagebus/src/tests/blob/CMakeLists.txt
+++ b/messagebus/src/tests/blob/CMakeLists.txt
@@ -4,6 +4,6 @@ vespa_add_executable(messagebus_blob_test_app TEST
     blob.cpp
     DEPENDS
     vespa_messagebus
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_test(NAME messagebus_blob_test_app COMMAND messagebus_blob_test_app)
diff --git a/messagebus/src/tests/bucketsequence/CMakeLists.txt b/messagebus/src/tests/bucketsequence/CMakeLists.txt
index 678372ae5590..9e8e96b4bec4 100644
--- a/messagebus/src/tests/bucketsequence/CMakeLists.txt
+++ b/messagebus/src/tests/bucketsequence/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_bucketsequence_test_app TEST
     SOURCES
     bucketsequence.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_bucketsequence_test_app COMMAND messagebus_bucketsequence_test_app)
diff --git a/messagebus/src/tests/choke/CMakeLists.txt b/messagebus/src/tests/choke/CMakeLists.txt
index d62c6afb06f2..610528aef389 100644
--- a/messagebus/src/tests/choke/CMakeLists.txt
+++ b/messagebus/src/tests/choke/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_choke_test_app TEST
     SOURCES
     choke.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/configagent/CMakeLists.txt b/messagebus/src/tests/configagent/CMakeLists.txt
index d209378d850c..0ed02314b2ec 100644
--- a/messagebus/src/tests/configagent/CMakeLists.txt
+++ b/messagebus/src/tests/configagent/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_configagent_test_app TEST
     SOURCES
     configagent.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/context/CMakeLists.txt b/messagebus/src/tests/context/CMakeLists.txt
index 85b39bcb28ff..0ed059c225cf 100644
--- a/messagebus/src/tests/context/CMakeLists.txt
+++ b/messagebus/src/tests/context/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_context_test_app TEST
     SOURCES
     context.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_context_test_app COMMAND messagebus_context_test_app)
diff --git a/messagebus/src/tests/emptyreply/CMakeLists.txt b/messagebus/src/tests/emptyreply/CMakeLists.txt
index 580d53a407c1..b5d482804955 100644
--- a/messagebus/src/tests/emptyreply/CMakeLists.txt
+++ b/messagebus/src/tests/emptyreply/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_emptyreply_test_app TEST
     SOURCES
     emptyreply.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_emptyreply_test_app COMMAND messagebus_emptyreply_test_app)
diff --git a/messagebus/src/tests/error/CMakeLists.txt b/messagebus/src/tests/error/CMakeLists.txt
index 93c76493660e..453d73aba435 100644
--- a/messagebus/src/tests/error/CMakeLists.txt
+++ b/messagebus/src/tests/error/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_error_test_app TEST
     SOURCES
     error.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_error_test_app COMMAND messagebus_error_test_app)
diff --git a/messagebus/src/tests/identity/CMakeLists.txt b/messagebus/src/tests/identity/CMakeLists.txt
index 456c258abe27..2771139df9ae 100644
--- a/messagebus/src/tests/identity/CMakeLists.txt
+++ b/messagebus/src/tests/identity/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_identity_test_app TEST
     SOURCES
     identity.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_identity_test_app COMMAND messagebus_identity_test_app)
diff --git a/messagebus/src/tests/messagebus/CMakeLists.txt b/messagebus/src/tests/messagebus/CMakeLists.txt
index 91aad4f9a636..c5240859d140 100644
--- a/messagebus/src/tests/messagebus/CMakeLists.txt
+++ b/messagebus/src/tests/messagebus/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_messagebus_test_app TEST
     SOURCES
     messagebus.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/messageordering/CMakeLists.txt b/messagebus/src/tests/messageordering/CMakeLists.txt
index a6b1a2c1941a..221dbcc42a0a 100644
--- a/messagebus/src/tests/messageordering/CMakeLists.txt
+++ b/messagebus/src/tests/messageordering/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_messageordering_test_app TEST
     SOURCES
     messageordering.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(
diff --git a/messagebus/src/tests/messenger/CMakeLists.txt b/messagebus/src/tests/messenger/CMakeLists.txt
index f8e9cb706686..3cf98f98c718 100644
--- a/messagebus/src/tests/messenger/CMakeLists.txt
+++ b/messagebus/src/tests/messenger/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_messenger_test_app TEST
     SOURCES
     messenger.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_messenger_test_app COMMAND messagebus_messenger_test_app)
diff --git a/messagebus/src/tests/protocolrepository/CMakeLists.txt b/messagebus/src/tests/protocolrepository/CMakeLists.txt
index a6023b5f2cec..4609855c5098 100644
--- a/messagebus/src/tests/protocolrepository/CMakeLists.txt
+++ b/messagebus/src/tests/protocolrepository/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_protocolrepository_test_app TEST
     SOURCES
     protocolrepository.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_protocolrepository_test_app NO_VALGRIND COMMAND messagebus_protocolrepository_test_app)
diff --git a/messagebus/src/tests/queue/CMakeLists.txt b/messagebus/src/tests/queue/CMakeLists.txt
index 04f2b529ad05..d2a35985b9e6 100644
--- a/messagebus/src/tests/queue/CMakeLists.txt
+++ b/messagebus/src/tests/queue/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_queue_test_app TEST
     SOURCES
     queue.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_queue_test_app COMMAND messagebus_queue_test_app)
diff --git a/messagebus/src/tests/replygate/CMakeLists.txt b/messagebus/src/tests/replygate/CMakeLists.txt
index a651fe2741b2..c548b56971b7 100644
--- a/messagebus/src/tests/replygate/CMakeLists.txt
+++ b/messagebus/src/tests/replygate/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_replygate_test_app TEST
     SOURCES
     replygate.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_replygate_test_app COMMAND messagebus_replygate_test_app)
diff --git a/messagebus/src/tests/resender/CMakeLists.txt b/messagebus/src/tests/resender/CMakeLists.txt
index 5bc0645ce528..93150e013112 100644
--- a/messagebus/src/tests/resender/CMakeLists.txt
+++ b/messagebus/src/tests/resender/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_resender_test_app TEST
     SOURCES
     resender.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/result/CMakeLists.txt b/messagebus/src/tests/result/CMakeLists.txt
index 056727162b3e..7d25570f33a6 100644
--- a/messagebus/src/tests/result/CMakeLists.txt
+++ b/messagebus/src/tests/result/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_result_test_app TEST
     SOURCES
     result.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/retrypolicy/CMakeLists.txt b/messagebus/src/tests/retrypolicy/CMakeLists.txt
index 62d2f97d8562..a3113a5ade11 100644
--- a/messagebus/src/tests/retrypolicy/CMakeLists.txt
+++ b/messagebus/src/tests/retrypolicy/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_retrypolicy_test_app TEST
     SOURCES
     retrypolicy.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_retrypolicy_test_app COMMAND messagebus_retrypolicy_test_app)
diff --git a/messagebus/src/tests/routable/CMakeLists.txt b/messagebus/src/tests/routable/CMakeLists.txt
index a677148e3402..ad19bb22d2dc 100644
--- a/messagebus/src/tests/routable/CMakeLists.txt
+++ b/messagebus/src/tests/routable/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_routable_test_app TEST
     SOURCES
     routable.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_routable_test_app COMMAND messagebus_routable_test_app)
diff --git a/messagebus/src/tests/routablequeue/CMakeLists.txt b/messagebus/src/tests/routablequeue/CMakeLists.txt
index b25388f84c65..7464b0490ad1 100644
--- a/messagebus/src/tests/routablequeue/CMakeLists.txt
+++ b/messagebus/src/tests/routablequeue/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_routablequeue_test_app TEST
     SOURCES
     routablequeue.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_routablequeue_test_app COMMAND messagebus_routablequeue_test_app)
diff --git a/messagebus/src/tests/routeparser/CMakeLists.txt b/messagebus/src/tests/routeparser/CMakeLists.txt
index 9e213a2c778e..065e7674d1ef 100644
--- a/messagebus/src/tests/routeparser/CMakeLists.txt
+++ b/messagebus/src/tests/routeparser/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_routeparser_test_app TEST
     SOURCES
     routeparser.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/routing/CMakeLists.txt b/messagebus/src/tests/routing/CMakeLists.txt
index 2f1427affcd3..db0c586bb096 100644
--- a/messagebus/src/tests/routing/CMakeLists.txt
+++ b/messagebus/src/tests/routing/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_routing_test_app TEST
     SOURCES
     routing.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/routingcontext/CMakeLists.txt b/messagebus/src/tests/routingcontext/CMakeLists.txt
index e4f8ff035065..8e16c7bf4898 100644
--- a/messagebus/src/tests/routingcontext/CMakeLists.txt
+++ b/messagebus/src/tests/routingcontext/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_routingcontext_test_app TEST
     SOURCES
     routingcontext.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/routingspec/CMakeLists.txt b/messagebus/src/tests/routingspec/CMakeLists.txt
index 96eee2362f7e..34fa9007fffa 100644
--- a/messagebus/src/tests/routingspec/CMakeLists.txt
+++ b/messagebus/src/tests/routingspec/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_routingspec_test_app TEST
     SOURCES
     routingspec.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt b/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt
index 459d70aaf50d..a667cd4c3c72 100644
--- a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt
+++ b/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_rpcserviceaddress_test_app TEST
     SOURCES
     rpcserviceaddress.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_rpcserviceaddress_test_app COMMAND messagebus_rpcserviceaddress_test_app)
diff --git a/messagebus/src/tests/sendadapter/CMakeLists.txt b/messagebus/src/tests/sendadapter/CMakeLists.txt
index 91042d35e59b..d0d4851d01fd 100644
--- a/messagebus/src/tests/sendadapter/CMakeLists.txt
+++ b/messagebus/src/tests/sendadapter/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_sendadapter_test_app TEST
     SOURCES
     sendadapter.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_sendadapter_test_app COMMAND messagebus_sendadapter_test_app)
diff --git a/messagebus/src/tests/sequencer/CMakeLists.txt b/messagebus/src/tests/sequencer/CMakeLists.txt
index 8f08e191d37d..6f5acb49d789 100644
--- a/messagebus/src/tests/sequencer/CMakeLists.txt
+++ b/messagebus/src/tests/sequencer/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_sequencer_test_app TEST
     SOURCES
     sequencer.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/serviceaddress/CMakeLists.txt b/messagebus/src/tests/serviceaddress/CMakeLists.txt
index 30356fb09adc..df5c7b6ec2f1 100644
--- a/messagebus/src/tests/serviceaddress/CMakeLists.txt
+++ b/messagebus/src/tests/serviceaddress/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_serviceaddress_test_app TEST
     SOURCES
     serviceaddress.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_serviceaddress_test_app COMMAND messagebus_serviceaddress_test_app)
diff --git a/messagebus/src/tests/servicepool/CMakeLists.txt b/messagebus/src/tests/servicepool/CMakeLists.txt
index 91efbba237b4..addd8daaa815 100644
--- a/messagebus/src/tests/servicepool/CMakeLists.txt
+++ b/messagebus/src/tests/servicepool/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_servicepool_test_app TEST
     SOURCES
     servicepool.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_servicepool_test_app COMMAND messagebus_servicepool_test_app)
diff --git a/messagebus/src/tests/shutdown/CMakeLists.txt b/messagebus/src/tests/shutdown/CMakeLists.txt
index ed2837a1ddf4..8cc0b9210fe5 100644
--- a/messagebus/src/tests/shutdown/CMakeLists.txt
+++ b/messagebus/src/tests/shutdown/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_shutdown_test_app TEST
     SOURCES
     shutdown.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_shutdown_test_app COMMAND messagebus_shutdown_test_app)
diff --git a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt b/messagebus/src/tests/simple-roundtrip/CMakeLists.txt
index a2b6875970e5..cef8a477e97d 100644
--- a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt
+++ b/messagebus/src/tests/simple-roundtrip/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_simple-roundtrip_test_app TEST
     SOURCES
     simple-roundtrip.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_simple-roundtrip_test_app COMMAND messagebus_simple-roundtrip_test_app)
diff --git a/messagebus/src/tests/simpleprotocol/CMakeLists.txt b/messagebus/src/tests/simpleprotocol/CMakeLists.txt
index bab4c105ff1f..cd8b4d84932e 100644
--- a/messagebus/src/tests/simpleprotocol/CMakeLists.txt
+++ b/messagebus/src/tests/simpleprotocol/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_simpleprotocol_test_app TEST
     SOURCES
     simpleprotocol.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_simpleprotocol_test_app COMMAND messagebus_simpleprotocol_test_app)
diff --git a/messagebus/src/tests/slobrok/CMakeLists.txt b/messagebus/src/tests/slobrok/CMakeLists.txt
index 0ad5c62fbd7a..a1dce99f3ccc 100644
--- a/messagebus/src/tests/slobrok/CMakeLists.txt
+++ b/messagebus/src/tests/slobrok/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_slobrok_test_app TEST
     SOURCES
     slobrok.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_slobrok_test_app COMMAND messagebus_slobrok_test_app)
diff --git a/messagebus/src/tests/sourcesession/CMakeLists.txt b/messagebus/src/tests/sourcesession/CMakeLists.txt
index 9319dc25b95c..8dd26a4ce16a 100644
--- a/messagebus/src/tests/sourcesession/CMakeLists.txt
+++ b/messagebus/src/tests/sourcesession/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_sourcesession_test_app TEST
     SOURCES
     sourcesession.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/targetpool/CMakeLists.txt b/messagebus/src/tests/targetpool/CMakeLists.txt
index 08aa6e299381..6990c10c8061 100644
--- a/messagebus/src/tests/targetpool/CMakeLists.txt
+++ b/messagebus/src/tests/targetpool/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_targetpool_test_app TEST
     SOURCES
     targetpool.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_targetpool_test_app COMMAND messagebus_targetpool_test_app)
diff --git a/messagebus/src/tests/throttling/CMakeLists.txt b/messagebus/src/tests/throttling/CMakeLists.txt
index d283e6a8f720..56cb058f72a6 100644
--- a/messagebus/src/tests/throttling/CMakeLists.txt
+++ b/messagebus/src/tests/throttling/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_throttling_test_app TEST
     SOURCES
     throttling.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/timeout/CMakeLists.txt b/messagebus/src/tests/timeout/CMakeLists.txt
index 7b242a152dad..b6620dfca4f0 100644
--- a/messagebus/src/tests/timeout/CMakeLists.txt
+++ b/messagebus/src/tests/timeout/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_timeout_test_app TEST
     SOURCES
     timeout.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
     GTest::gtest
 )
diff --git a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt b/messagebus/src/tests/trace-roundtrip/CMakeLists.txt
index 6185198d6423..30bda0803e83 100644
--- a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt
+++ b/messagebus/src/tests/trace-roundtrip/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(messagebus_trace-roundtrip_test_app TEST
     SOURCES
     trace-roundtrip.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
 vespa_add_test(NAME messagebus_trace-roundtrip_test_app COMMAND messagebus_trace-roundtrip_test_app)
diff --git a/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt b/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt
index f632a78efed7..ce838b86ee23 100644
--- a/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt
+++ b/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(messagebus_messagebus-test
+vespa_add_library(vespa_messagebus-test
     SOURCES
     custompolicy.cpp
     receptor.cpp
diff --git a/messagebus_test/src/tests/error/CMakeLists.txt b/messagebus_test/src/tests/error/CMakeLists.txt
index d67e8fc89e85..1ad1852b00f1 100644
--- a/messagebus_test/src/tests/error/CMakeLists.txt
+++ b/messagebus_test/src/tests/error/CMakeLists.txt
@@ -3,19 +3,19 @@ vespa_add_executable(messagebus_test_error_test_app TEST
     SOURCES
     error.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-server-error_app
     SOURCES
     cpp-server.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-client-error_app
     SOURCES
     cpp-client.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_test(NAME messagebus_test_error_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/error_test.sh
                DEPENDS messagebus_test_error_test_app messagebus_test_cpp-server-error_app messagebus_test_cpp-client-error_app)
diff --git a/messagebus_test/src/tests/speed/CMakeLists.txt b/messagebus_test/src/tests/speed/CMakeLists.txt
index 612e07e5ab36..79eb979558ad 100644
--- a/messagebus_test/src/tests/speed/CMakeLists.txt
+++ b/messagebus_test/src/tests/speed/CMakeLists.txt
@@ -3,19 +3,19 @@ vespa_add_executable(messagebus_test_speed_test_app
     SOURCES
     speed.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-server-speed_app
     SOURCES
     cpp-server.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-client-speed_app
     SOURCES
     cpp-client.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_test(NAME messagebus_test_speed_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/speed_test.sh BENCHMARK
                DEPENDS messagebus_test_speed_test_app messagebus_test_cpp-server-speed_app messagebus_test_cpp-client-speed_app )
diff --git a/messagebus_test/src/tests/trace/CMakeLists.txt b/messagebus_test/src/tests/trace/CMakeLists.txt
index 93660c5f3450..66273b3a97c8 100644
--- a/messagebus_test/src/tests/trace/CMakeLists.txt
+++ b/messagebus_test/src/tests/trace/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(messagebus_test_trace_test_app TEST
     SOURCES
     trace.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_executable(messagebus_test_cpp-server-trace_app
     SOURCES
     cpp-server.cpp
     DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 vespa_add_test(NAME messagebus_test_trace_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/trace_test.sh
                DEPENDS messagebus_test_trace_test_app messagebus_test_cpp-server-trace_app)
diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt
index ce22f85e7162..d112bcdf3704 100644
--- a/searchcore/CMakeLists.txt
+++ b/searchcore/CMakeLists.txt
@@ -159,7 +159,7 @@ vespa_define_module(
     src/tests/index/index_disk_layout
 
     TEST_DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 )
 
 vespa_install_script(src/apps/vespa-remove-indexes/vespa-remove-index.sh vespa-remove-index bin)
diff --git a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt
index a02cddb0d8c9..324e0b89d26c 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt
@@ -50,6 +50,6 @@ vespa_add_library(searchcore_bmcluster STATIC
     searchcore_proton_metrics
     searchcorespi
     storageserver_storageapp
-    messagebus_messagebus-test
+    vespa_messagebus-test
     vespa_messagebus
 )
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index 95d787d377f0..343fee95909e 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -53,7 +53,7 @@ vespa_define_module(
     src/vespa/storageapi/messageapi
 
     TEST_DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
     TEST_EXTERNAL_DEPENDS
     ${VESPA_ATOMIC_LIB}
 
diff --git a/storageserver/CMakeLists.txt b/storageserver/CMakeLists.txt
index 617474d80b12..728fa2173c5f 100644
--- a/storageserver/CMakeLists.txt
+++ b/storageserver/CMakeLists.txt
@@ -9,7 +9,7 @@ vespa_define_module(
     src/vespa/storageserver/app
 
     TEST_DEPENDS
-    messagebus_messagebus-test
+    vespa_messagebus-test
 
     TESTS
     src/tests