diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
index e705119b2ca9..901e25977562 100644
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@@ -1345,6 +1345,7 @@ eunit(
         ":test_test_rabbit_event_handler_beam",
         ":test_clustering_utils_beam",
         ":test_event_recorder_beam",
+        ":test_rabbit_ct_hook_beam",
     ],
     target = ":test_erlang_app",
     test_env = {
diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
index 88984b3401fd..cfd7bc31a469 100644
--- a/deps/rabbit/app.bzl
+++ b/deps/rabbit/app.bzl
@@ -2170,3 +2170,11 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         erlc_opts = "//:test_erlc_opts",
         deps = ["//deps/amqp_client:erlang_app"],
     )
+    erlang_bytecode(
+        name = "test_rabbit_ct_hook_beam",
+        testonly = True,
+        srcs = ["test/rabbit_ct_hook.erl"],
+        outs = ["test/rabbit_ct_hook.beam"],
+        app_name = "rabbit",
+        erlc_opts = "//:test_erlc_opts",
+    )
diff --git a/deps/rabbitmq_mqtt/app.bzl b/deps/rabbitmq_mqtt/app.bzl
index 87d17a12e46d..86830f4f9c7a 100644
--- a/deps/rabbitmq_mqtt/app.bzl
+++ b/deps/rabbitmq_mqtt/app.bzl
@@ -255,15 +255,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         erlc_opts = "//:test_erlc_opts",
     )
 
-    erlang_bytecode(
-        name = "shared_SUITE_beam_files",
-        testonly = True,
-        srcs = ["test/shared_SUITE.erl"],
-        outs = ["test/shared_SUITE.beam"],
-        app_name = "rabbitmq_mqtt",
-        erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
-    )
     erlang_bytecode(
         name = "test_event_recorder_beam",
         testonly = True,
@@ -329,3 +320,12 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         erlc_opts = "//:test_erlc_opts",
         deps = ["//deps/amqp10_common:erlang_app", "//deps/amqp_client:erlang_app", "//deps/rabbitmq_stomp:erlang_app"],
     )
+    erlang_bytecode(
+        name = "mqtt_shared_SUITE_beam_files",
+        testonly = True,
+        srcs = ["test/mqtt_shared_SUITE.erl"],
+        outs = ["test/mqtt_shared_SUITE.beam"],
+        app_name = "rabbitmq_mqtt",
+        erlc_opts = "//:test_erlc_opts",
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
+    )
diff --git a/deps/rabbitmq_web_mqtt/app.bzl b/deps/rabbitmq_web_mqtt/app.bzl
index 17ab4ecacb84..d7a5de02fdde 100644
--- a/deps/rabbitmq_web_mqtt/app.bzl
+++ b/deps/rabbitmq_web_mqtt/app.bzl
@@ -93,60 +93,76 @@ def all_srcs(name = "all_srcs"):
 
 def test_suite_beam_files(name = "test_suite_beam_files"):
     erlang_bytecode(
-        name = "config_schema_SUITE_beam_files",
+        name = "test_src_rabbit_ws_test_util_beam",
         testonly = True,
-        srcs = ["test/config_schema_SUITE.erl"],
-        outs = ["test/config_schema_SUITE.beam"],
+        srcs = ["test/src/rabbit_ws_test_util.erl"],
+        outs = ["test/src/rabbit_ws_test_util.beam"],
         app_name = "rabbitmq_web_mqtt",
         erlc_opts = "//:test_erlc_opts",
     )
     erlang_bytecode(
-        name = "proxy_protocol_SUITE_beam_files",
+        name = "test_src_rfc6455_client_beam",
         testonly = True,
-        srcs = ["test/proxy_protocol_SUITE.erl"],
-        outs = ["test/proxy_protocol_SUITE.beam"],
+        srcs = ["test/src/rfc6455_client.erl"],
+        outs = ["test/src/rfc6455_client.beam"],
         app_name = "rabbitmq_web_mqtt",
         erlc_opts = "//:test_erlc_opts",
     )
+
     erlang_bytecode(
-        name = "system_SUITE_beam_files",
+        name = "test_rabbit_web_mqtt_test_util_beam",
         testonly = True,
-        srcs = ["test/system_SUITE.erl"],
-        outs = ["test/system_SUITE.beam"],
+        srcs = ["test/rabbit_web_mqtt_test_util.erl"],
+        outs = ["test/rabbit_web_mqtt_test_util.beam"],
         app_name = "rabbitmq_web_mqtt",
         erlc_opts = "//:test_erlc_opts",
     )
-
     erlang_bytecode(
-        name = "test_src_rabbit_ws_test_util_beam",
+        name = "web_mqtt_command_SUITE_beam_files",
         testonly = True,
-        srcs = ["test/src/rabbit_ws_test_util.erl"],
-        outs = ["test/src/rabbit_ws_test_util.beam"],
+        srcs = ["test/web_mqtt_command_SUITE.erl"],
+        outs = ["test/web_mqtt_command_SUITE.beam"],
         app_name = "rabbitmq_web_mqtt",
         erlc_opts = "//:test_erlc_opts",
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_mqtt:erlang_app"],
     )
     erlang_bytecode(
-        name = "test_src_rfc6455_client_beam",
+        name = "web_mqtt_config_schema_SUITE_beam_files",
         testonly = True,
-        srcs = ["test/src/rfc6455_client.erl"],
-        outs = ["test/src/rfc6455_client.beam"],
+        srcs = ["test/web_mqtt_config_schema_SUITE.erl"],
+        outs = ["test/web_mqtt_config_schema_SUITE.beam"],
         app_name = "rabbitmq_web_mqtt",
         erlc_opts = "//:test_erlc_opts",
     )
     erlang_bytecode(
-        name = "command_SUITE_beam_files",
+        name = "web_mqtt_proxy_protocol_SUITE_beam_files",
         testonly = True,
-        srcs = ["test/command_SUITE.erl"],
-        outs = ["test/command_SUITE.beam"],
+        srcs = ["test/web_mqtt_proxy_protocol_SUITE.erl"],
+        outs = ["test/web_mqtt_proxy_protocol_SUITE.beam"],
         app_name = "rabbitmq_web_mqtt",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_mqtt:erlang_app"],
     )
     erlang_bytecode(
-        name = "test_rabbit_web_mqtt_test_util_beam",
+        name = "web_mqtt_shared_SUITE_beam_files",
         testonly = True,
-        srcs = ["test/rabbit_web_mqtt_test_util.erl"],
-        outs = ["test/rabbit_web_mqtt_test_util.beam"],
+        srcs = ["test/web_mqtt_shared_SUITE.erl"],
+        outs = ["test/web_mqtt_shared_SUITE.beam"],
+        app_name = "rabbitmq_web_mqtt",
+        erlc_opts = "//:test_erlc_opts",
+    )
+    erlang_bytecode(
+        name = "web_mqtt_system_SUITE_beam_files",
+        testonly = True,
+        srcs = ["test/web_mqtt_system_SUITE.erl"],
+        outs = ["test/web_mqtt_system_SUITE.beam"],
+        app_name = "rabbitmq_web_mqtt",
+        erlc_opts = "//:test_erlc_opts",
+    )
+    erlang_bytecode(
+        name = "web_mqtt_v5_SUITE_beam_files",
+        testonly = True,
+        srcs = ["test/web_mqtt_v5_SUITE.erl"],
+        outs = ["test/web_mqtt_v5_SUITE.beam"],
         app_name = "rabbitmq_web_mqtt",
         erlc_opts = "//:test_erlc_opts",
     )