Add rabbit_common to the deps in rabbitmq_integration_suite macro

While not all suites strictly require it, those same suites depend on
it via the broker dependency anyway. Thus, there is no penalty, but it
shortens the BUILD.bazel file for deps/rabbit

4 files changed, 21 insertions, 269 deletions

diff --git a/deps/amqp_client/BUILD.bazel b/deps/amqp_client/BUILD.bazel
index 4f7a37d11c..81f7d1aa0c 100644
--- a/deps/amqp_client/BUILD.bazel
+++ b/deps/amqp_client/BUILD.bazel
@@ -56,7 +56,6 @@ rabbitmq_integration_suite(
     runtime_deps = [
         "@meck//:bazel_erlang_lib",
     ],
-    deps = DEPS,
 )
 
 ct_suite(
@@ -69,5 +68,7 @@ ct_suite(
     runtime_deps = [
         "//deps/rabbit:bazel_erlang_lib",
     ],
-    deps = DEPS,
+    deps = [
+        "//deps/rabbit_common:bazel_erlang_lib",
+    ],
 )
diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
index 499ed6d8a0..5aaec14957 100644
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@@ -273,9 +273,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "backing_queue_SUITE",
     size = "large",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -286,9 +283,6 @@ rabbitmq_integration_suite(
         "test/dummy_interceptor.erl",
         "test/failing_dummy_interceptor.erl",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -298,9 +292,6 @@ rabbitmq_integration_suite(
     additional_srcs = [
         "test/channel_operation_timeout_test_queue.erl",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -311,27 +302,18 @@ rabbitmq_integration_suite(
         "cluster_size_2",
         "cluster_size_3",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "cluster_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "clustering_management_SUITE",
     size = "large",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -347,9 +329,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "confirms_rejects_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -359,18 +338,12 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":quorum_queue_utils",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "crashing_queues_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -380,27 +353,18 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":quorum_queue_utils",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "definition_import_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "disconnect_detected_during_alarm_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -436,7 +400,6 @@ rabbitmq_integration_suite(
         ],
     },
     deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
         "@proper//:bazel_erlang_lib",
     ],
 )
@@ -449,7 +412,6 @@ rabbitmq_integration_suite(
         ":quorum_queue_utils",
     ],
     deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
         "@proper//:bazel_erlang_lib",
     ],
 )
@@ -474,9 +436,6 @@ rabbitmq_integration_suite(
         ],
     },
     tags = ["classic-queue"],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -534,7 +493,6 @@ rabbitmq_integration_suite(
         },
     },
     runtime_deps = [
-        "//deps/rabbit/apps/rabbitmq_prelaunch:test_bazel_erlang_lib",
         "//deps/rabbit/test/feature_flags_SUITE_data/my_plugin:bazel_erlang_lib",
     ],
 )
@@ -543,27 +501,18 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "lazy_queue_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "list_consumers_sanity_check_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "list_queues_online_and_offline_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -573,9 +522,6 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":quorum_queue_utils",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -586,18 +532,12 @@ rabbitmq_integration_suite(
         ":rabbit_ha_test_consumer",
         ":rabbit_ha_test_producer",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "message_size_limit_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -605,7 +545,6 @@ rabbitmq_integration_suite(
     name = "metrics_SUITE",
     size = "medium",
     deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
         "@proper//:bazel_erlang_lib",
     ],
 )
@@ -654,117 +593,78 @@ rabbitmq_integration_suite(
             "no_nodes_configured",
         ],
     },
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "peer_discovery_dns_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_user_connection_channel_limit_partitions_SUITE",
     size = "large",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_user_connection_channel_limit_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_user_connection_channel_tracking_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_user_connection_tracking_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_vhost_connection_limit_partitions_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_vhost_connection_limit_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_vhost_msg_store_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "per_vhost_queue_limit_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "policy_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "priority_queue_recovery_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "priority_queue_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -777,9 +677,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "proxy_protocol_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -789,27 +686,18 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":quorum_queue_utils",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "queue_length_limits_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "queue_master_location_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -827,18 +715,12 @@ rabbitmq_integration_suite(
         "quorum_queue_in_memory_bytes",
         "stream_queue",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "queue_type_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -869,9 +751,6 @@ rabbitmq_integration_suite(
             "groups": ["clustered_with_partitions"],
         },
     },
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
@@ -890,9 +769,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "rabbit_core_metrics_gc_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
@@ -1031,7 +907,6 @@ rabbitmq_integration_suite(
         "cluster_size_3_1": {"groups": ["cluster_size_3_1"]},
     },
     deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
         "@proper//:bazel_erlang_lib",
     ],
 )
@@ -1040,27 +915,18 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "rabbitmq_queues_cli_integration_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "rabbitmqctl_integration_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "rabbitmqctl_shutdown_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1081,9 +947,6 @@ rabbitmq_integration_suite(
         "cluster_size_2",
         "cluster_size_3",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1097,18 +960,12 @@ rabbitmq_integration_suite(
         "classic_queue",
         "quorum_queue",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "sync_detection_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
@@ -1125,9 +982,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "topic_permission_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1138,9 +992,6 @@ rabbitmq_integration_suite(
         "test/rabbit_auth_backend_context_propagation_mock.erl",
         "test/rabbit_foo_protocol_connection_info.erl",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1159,9 +1010,6 @@ rabbitmq_integration_suite(
     additional_srcs = [
         "test/rabbit_dummy_protocol_connection_info.erl",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
@@ -1177,18 +1025,12 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "unit_amqp091_server_properties_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
     PACKAGE,
     name = "unit_app_management_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
@@ -1224,9 +1066,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "unit_connection_tracking_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1251,9 +1090,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "unit_file_handle_cache_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1276,9 +1112,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "unit_log_management_SUITE",
     size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
@@ -1343,9 +1176,6 @@ rabbitmq_integration_suite(
     additional_srcs = [
         "test/dummy_event_receiver.erl",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
@@ -1355,9 +1185,6 @@ ct_suite(
         "test/dummy_supervisor2.erl",
     ],
     erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1370,9 +1197,6 @@ rabbitmq_integration_suite(
     PACKAGE,
     name = "upgrade_preparation_SUITE",
     size = "medium",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 rabbitmq_integration_suite(
@@ -1385,7 +1209,4 @@ rabbitmq_integration_suite(
         "cluster_size_1_direct",
         "cluster_size_2_direct",
     ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
diff --git a/deps/rabbitmq_amqp1_0/BUILD.bazel b/deps/rabbitmq_amqp1_0/BUILD.bazel
index 4adb1ccfb7..454c49575f 100644
--- a/deps/rabbitmq_amqp1_0/BUILD.bazel
+++ b/deps/rabbitmq_amqp1_0/BUILD.bazel
@@ -1,7 +1,13 @@
 load("@bazel-erlang//:ct.bzl", "ct_suite")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
-load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_TEST_ERLC_OPTS", "rabbitmq_lib")
+load(
+    "//:rabbitmq.bzl",
+    "APP_VERSION",
+    "RABBITMQ_TEST_ERLC_OPTS",
+    "rabbitmq_integration_suite",
+    "rabbitmq_lib",
+)
 
 APP_ENV = """[
 	    {default_user, "guest"},
@@ -50,93 +56,32 @@ rabbitmq_run(
     home = ":broker-for-tests-home",
 )
 
-ct_suite(
+PACKAGE = "deps/rabbitmq_amqp1_0"
+
+rabbitmq_integration_suite(
+    PACKAGE,
     name = "amqp10_client_SUITE",
-    data = [
-        "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
-        "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
-    ],
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
-    test_env = {
-        "RABBITMQ_CT_SKIP_AS_ERROR": "true",
-        "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/rabbitmq-for-tests-run",
-        "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmqctl",
-        "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmq-plugins",
-    },
-    tools = [
-        ":rabbitmq-for-tests-run",
-    ],
     runtime_deps = [
         "//deps/amqp10_client:bazel_erlang_lib",
-        "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib",
-        "//deps/rabbitmq_cli:rabbitmqctl",
-        "@rabbitmq_ct_client_helpers//:bazel_erlang_lib",
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
     ],
 )
 
-ct_suite(
+rabbitmq_integration_suite(
+    PACKAGE,
     name = "command_SUITE",
-    data = [
-        "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
-        "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
-    ],
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
-    test_env = {
-        "RABBITMQ_CT_SKIP_AS_ERROR": "true",
-        "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/rabbitmq-for-tests-run",
-        "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmqctl",
-        "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmq-plugins",
-    },
-    tools = [
-        ":rabbitmq-for-tests-run",
-    ],
-    runtime_deps = [
-        "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib",
-        "//deps/rabbitmq_cli:rabbitmqctl",
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
     deps = [
         "//deps/amqp10_common:bazel_erlang_lib",
-        "//deps/amqp_client:bazel_erlang_lib",
-        "//deps/rabbit_common:bazel_erlang_lib",
     ],
 )
 
-ct_suite(
+rabbitmq_integration_suite(
+    PACKAGE,
     name = "proxy_protocol_SUITE",
-    data = [
-        "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
-        "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
-    ],
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
-    test_env = {
-        "RABBITMQ_CT_SKIP_AS_ERROR": "true",
-        "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/rabbitmq-for-tests-run",
-        "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmqctl",
-        "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmq-plugins",
-    },
-    tools = [
-        ":rabbitmq-for-tests-run",
-    ],
-    runtime_deps = [
-        "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib",
-        "//deps/rabbitmq_cli:rabbitmqctl",
-        "@rabbitmq_ct_client_helpers//:bazel_erlang_lib",
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
 )
 
-ct_suite(
+rabbitmq_integration_suite(
+    PACKAGE,
     name = "system_SUITE",
-    data = [
-        "@rabbitmq_ct_helpers//tools/tls-certs:Makefile",
-        "@rabbitmq_ct_helpers//tools/tls-certs:openssl.cnf.in",
-    ],
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
     groups = [
         "dotnet",
         "java",
@@ -145,24 +90,8 @@ ct_suite(
         "dotnet",
     ],
     test_env = {
-        "RABBITMQ_CT_SKIP_AS_ERROR": "true",
-        "RABBITMQ_RUN": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/rabbitmq-for-tests-run",
-        "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmqctl",
-        "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/deps/rabbitmq_amqp1_0/broker-for-tests-home/sbin/rabbitmq-plugins",
         "TMPDIR": "$TEST_TMPDIR",
     },
-    tools = [
-        ":rabbitmq-for-tests-run",
-    ],
-    runtime_deps = [
-        "//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib",
-        "//deps/rabbitmq_cli:rabbitmqctl",
-        "@rabbitmq_ct_client_helpers//:bazel_erlang_lib",
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
 )
 
 ct_suite(
diff --git a/rabbitmq.bzl b/rabbitmq.bzl
index 3ccef341b2..f56fff33c0 100644
--- a/rabbitmq.bzl
+++ b/rabbitmq.bzl
@@ -108,6 +108,7 @@ def rabbitmq_integration_suite(
         ] + runtime_deps,
         deps = [
             "//deps/amqp_client:bazel_erlang_lib",
+            "//deps/rabbit_common:bazel_erlang_lib",
             "@rabbitmq_ct_helpers//:bazel_erlang_lib",
         ] + deps,
         **kwargs