diff --git a/deps/rabbitmq_stream/BUILD.bazel b/deps/rabbitmq_stream/BUILD.bazel
index 0faf09fe42..68f5fe8038 100644
--- a/deps/rabbitmq_stream/BUILD.bazel
+++ b/deps/rabbitmq_stream/BUILD.bazel
@@ -38,6 +38,10 @@ BUILD_DEPS = [
     "@ranch//:bazel_erlang_lib",
 ]
 
+DEPS = [
+    "//deps/rabbitmq_stream_common:bazel_erlang_lib",
+]
+
 RUNTIME_DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
 ]
@@ -49,6 +53,7 @@ rabbitmq_lib(
     app_name = APP_NAME,
     build_deps = BUILD_DEPS,
     runtime_deps = RUNTIME_DEPS,
+    deps = DEPS,
 )
 
 xref(tags = ["xref"])
@@ -70,6 +75,9 @@ rabbitmq_integration_suite(
         ":rabbit_stream_SUITE_beam_files",
     ],
     data = glob(["test/rabbit_stream_SUITE_data/**/*"]),
+    deps = [
+        "//deps/rabbitmq_stream_common:bazel_erlang_lib",
+    ],
 )
 
 rabbitmq_integration_suite(
@@ -77,11 +85,6 @@ rabbitmq_integration_suite(
     name = "config_schema_SUITE",
 )
 
-rabbitmq_suite(
-    name = "rabbit_stream_core_SUITE",
-    size = "small",
-)
-
 rabbitmq_integration_suite(
     PACKAGE,
     name = "rabbit_stream_SUITE",
@@ -89,4 +92,7 @@ rabbitmq_integration_suite(
         "single_node",
         "cluster",
     ],
+    deps = [
+        "//deps/rabbitmq_stream_common:bazel_erlang_lib",
+    ],
 )
diff --git a/deps/rabbitmq_stream_common/BUILD.bazel b/deps/rabbitmq_stream_common/BUILD.bazel
index c4ac1716e0..39e1f37f57 100644
--- a/deps/rabbitmq_stream_common/BUILD.bazel
+++ b/deps/rabbitmq_stream_common/BUILD.bazel
@@ -4,29 +4,21 @@ load(
     "//:rabbitmq.bzl",
     "RABBITMQ_DIALYZER_OPTS",
     "broker_for_integration_suites",
-    "rabbitmq_integration_suite",
     "rabbitmq_lib",
+    "rabbitmq_suite",
 )
 
 APP_NAME = "rabbitmq_stream_common"
 
 APP_DESCRIPTION = "RabbitMQ Stream Common"
 
-BUILD_DEPS = [
-    "//deps/rabbit_common:bazel_erlang_lib"
-]
-
 DEPS = [
-]
-
-RUNTIME_DEPS = [
+    "//deps/rabbit_common:bazel_erlang_lib",
 ]
 
 rabbitmq_lib(
     app_description = APP_DESCRIPTION,
     app_name = APP_NAME,
-    build_deps = BUILD_DEPS,
-    runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
 )
 
@@ -38,6 +30,6 @@ dialyze(
     tags = ["dialyze"],
 )
 
-broker_for_integration_suites()
-
-PACKAGE = "deps/rabbitmq_stream_common"
+rabbitmq_suite(
+    name = "rabbit_stream_core_SUITE",
+)