Also assert no missing suites for all other deps

2021-07-12 17:54:55 +02:00 · 2021-07-12 17:54:55 +02:00 · 8f9de08de7
parent 05111b3653
commit 8f9de08de7
38 changed files with 1092 additions and 944 deletions
--- a/deps/amqp10_client/BUILD.bazel
+++ b/deps/amqp10_client/BUILD.bazel
@ -1,10 +1,10 @@
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
-load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load(
    "//:rabbitmq.bzl",
+    "assert_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
    "rabbitmq_suite",
@ -52,11 +52,6 @@ dialyze(
    tags = ["dialyze"],
 )

-rabbitmq_suite(
-    name = "msg_SUITE",
-    deps = DEPS,
-)
-
 rabbitmq_home(
    name = "broker-for-tests-home",
    plugins = [
@ -72,25 +67,36 @@ rabbitmq_run(

 PACKAGE = "deps/amqp10_client"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-    size = "medium",
-    additional_hdrs = [
-        "src/amqp10_client.hrl",
-    ],
-    additional_srcs = [
-        "test/activemq_ct_helpers.erl",
-        "test/mock_server.erl",
-    ],
-    data = [
-        "@activemq//:exec_dir",
-    ],
-    erlc_opts = [
-        "-I deps/amqp10_client",
-    ],
-    test_env = {
-        "ACTIVEMQ": "$TEST_SRCDIR/$TEST_WORKSPACE/external/activemq/bin/activemq",
-    },
-    deps = DEPS,
+suites = [
+    rabbitmq_suite(
+        name = "msg_SUITE",
+        deps = DEPS,
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        size = "medium",
+        additional_hdrs = [
+            "src/amqp10_client.hrl",
+        ],
+        additional_srcs = [
+            "test/activemq_ct_helpers.erl",
+            "test/mock_server.erl",
+        ],
+        data = [
+            "@activemq//:exec_dir",
+        ],
+        erlc_opts = [
+            "-I deps/amqp10_client",
+        ],
+        test_env = {
+            "ACTIVEMQ": "$TEST_SRCDIR/$TEST_WORKSPACE/external/activemq/bin/activemq",
+        },
+        deps = DEPS,
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/amqp10_common/BUILD.bazel
+++ b/deps/amqp10_common/BUILD.bazel
@ -6,12 +6,13 @@ load(
 )
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
-load("@bazel-erlang//:ct.bzl", "ct_suite")
 load(
    "//:rabbitmq.bzl",
    "APP_VERSION",
    "RABBITMQ_ERLC_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
+    "rabbitmq_suite",
 )

 py_binary(
@ -98,12 +99,16 @@ dialyze(
    tags = ["dialyze"],
 )

-ct_suite(
-    name = "binary_generator_SUITE",
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
-)
+suites = [
+    rabbitmq_suite(
+        name = "binary_generator_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "binary_parser_SUITE",
+    ),
+]

-ct_suite(
-    name = "binary_parser_SUITE",
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/amqp_client/BUILD.bazel
+++ b/deps/amqp_client/BUILD.bazel
@ -4,6 +4,7 @@ load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load(
    "//:rabbitmq.bzl",
+    "assert_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
    "rabbitmq_suite",
@ -64,22 +65,28 @@ rabbitmq_run(
    home = ":broker-for-tests-home",
 )

-rabbitmq_integration_suite(
-    "deps/amqp_client",
-    name = "system_SUITE",
-    size = "large",
-    runtime_deps = [
-        "@meck//:bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_integration_suite(
+        "deps/amqp_client",
+        name = "system_SUITE",
+        size = "large",
+        runtime_deps = [
+            "@meck//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "small",
+        runtime_deps = [
+            "//deps/rabbit:bazel_erlang_lib",
+        ],
+        deps = [
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_suite(
-    name = "unit_SUITE",
-    size = "small",
-    runtime_deps = [
-        "//deps/rabbit:bazel_erlang_lib",
-    ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@ -1,5 +1,4 @@
 load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
-load("@bazel-erlang//:ct.bzl", "ct_group_case_matrix", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
@ -728,6 +727,9 @@ suites = [
    ),
    rabbitmq_suite(
        name = "rabbit_stream_coordinator_SUITE",
+        deps = [
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
    ),
    rabbitmq_integration_suite(
        PACKAGE,
--- a/deps/rabbit_common/BUILD.bazel
+++ b/deps/rabbit_common/BUILD.bazel
@ -1,8 +1,19 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "app_file", "bazel_erlang_lib", "erlc")
+load(
+    "@bazel-erlang//:bazel_erlang_lib.bzl",
+    "app_file",
+    "bazel_erlang_lib",
+    "erlc",
+)
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
-load("@bazel-erlang//:ct.bzl", "ct_test")
-load("//:rabbitmq.bzl", "APP_VERSION", "RABBITMQ_ERLC_OPTS", "RABBITMQ_TEST_ERLC_OPTS")
+load(
+    "//:rabbitmq.bzl",
+    "APP_VERSION",
+    "RABBITMQ_ERLC_OPTS",
+    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
+    "rabbitmq_suite",
+)

 py_binary(
    name = "codegen",
@ -184,115 +195,40 @@ dialyze(
    tags = ["dialyze"],
 )

-erlc(
-    name = "rabbit_env_SUITE_beam_files",
-    testonly = True,
-    srcs = ["test/rabbit_env_SUITE.erl"],
-    hdrs = HDRS,
-    dest = "test",
-    erlc_opts = RABBITMQ_ERLC_OPTS + RABBITMQ_TEST_ERLC_OPTS,
-    deps = [
-        ":test_bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_suite(
+        name = "rabbit_env_SUITE",
+        size = "small",
+        deps = [
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "supervisor2_SUITE",
+        size = "small",
+    ),
+    rabbitmq_suite(
+        name = "unit_priority_queue_SUITE",
+        size = "small",
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "medium",
+        additional_srcs = [
+            "test/gen_server2_test_server.erl",
+        ],
+        deps = [
+            "@credentials_obfuscation//:bazel_erlang_lib",
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "worker_pool_SUITE",
+        size = "small",
+    ),
+]

-ct_test(
-    name = "rabbit_env_SUITE",
-    size = "small",
-    compiled_suites = [":rabbit_env_SUITE_beam_files"],
-    deps = [
-        ":test_bazel_erlang_lib",
-        "//deps/rabbit:test_bazel_erlang_lib",
-        "@proper//:bazel_erlang_lib",
-    ],
-)
-
-erlc(
-    name = "supervisor2_SUITE_beam_files",
-    testonly = True,
-    srcs = ["test/supervisor2_SUITE.erl"],
-    hdrs = HDRS,
-    dest = "test",
-    erlc_opts = RABBITMQ_ERLC_OPTS + RABBITMQ_TEST_ERLC_OPTS,
-    deps = [
-        ":test_bazel_erlang_lib",
-    ],
-)
-
-ct_test(
-    name = "supervisor2_SUITE",
-    size = "small",
-    compiled_suites = [":supervisor2_SUITE_beam_files"],
-    deps = [
-        ":test_bazel_erlang_lib",
-    ],
-)
-
-erlc(
-    name = "unit_priority_queue_SUITE_beam_files",
-    testonly = True,
-    srcs = ["test/unit_priority_queue_SUITE.erl"],
-    hdrs = HDRS,
-    dest = "test",
-    erlc_opts = RABBITMQ_ERLC_OPTS + RABBITMQ_TEST_ERLC_OPTS,
-    deps = [
-        ":test_bazel_erlang_lib",
-    ],
-)
-
-ct_test(
-    name = "unit_priority_queue_SUITE",
-    size = "small",
-    compiled_suites = [":unit_priority_queue_SUITE_beam_files"],
-    deps = [
-        ":test_bazel_erlang_lib",
-    ],
-)
-
-erlc(
-    name = "unit_SUITE_beam_files",
-    testonly = True,
-    srcs = [
-        "test/gen_server2_test_server.erl",
-        "test/unit_SUITE.erl",
-    ],
-    hdrs = HDRS,
-    dest = "test",
-    erlc_opts = RABBITMQ_ERLC_OPTS + RABBITMQ_TEST_ERLC_OPTS,
-    deps = [
-        ":test_bazel_erlang_lib",
-        "@proper//:bazel_erlang_lib",
-    ],
-)
-
-ct_test(
-    name = "unit_SUITE",
-    size = "medium",
-    compiled_suites = [":unit_SUITE_beam_files"],
-    deps = [
-        ":test_bazel_erlang_lib",
-        "@credentials_obfuscation//:bazel_erlang_lib",
-        "@proper//:bazel_erlang_lib",
-    ],
-)
-
-erlc(
-    name = "worker_pool_SUITE_beam_files",
-    testonly = True,
-    srcs = ["test/worker_pool_SUITE.erl"],
-    hdrs = HDRS,
-    dest = "test",
-    erlc_opts = RABBITMQ_ERLC_OPTS + RABBITMQ_TEST_ERLC_OPTS,
-    deps = [
-        ":test_bazel_erlang_lib",
-    ],
-)
-
-ct_test(
-    name = "worker_pool_SUITE",
-    size = "small",
-    compiled_suites = [":worker_pool_SUITE_beam_files"],
-    deps = [
-        ":test_bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_amqp1_0/BUILD.bazel
+++ b/deps/rabbitmq_amqp1_0/BUILD.bazel
@ -1,9 +1,9 @@
-load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -59,46 +59,49 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_amqp1_0"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "amqp10_client_SUITE",
-    size = "small",
-    runtime_deps = [
-        "//deps/amqp10_client:bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "amqp10_client_SUITE",
+        size = "small",
+        runtime_deps = [
+            "//deps/amqp10_client:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "command_SUITE",
+        size = "small",
+        deps = [
+            "//deps/amqp10_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "proxy_protocol_SUITE",
+        size = "small",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        flaky = True,
+        tags = [
+            "dotnet",
+        ],
+        test_env = {
+            "TMPDIR": "$TEST_TMPDIR",
+        },
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "small",
+        deps = [
+            "//deps/amqp10_common:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "command_SUITE",
-    size = "small",
-    deps = [
-        "//deps/amqp10_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "proxy_protocol_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-    flaky = True,
-    tags = [
-        "dotnet",
-    ],
-    test_env = {
-        "TMPDIR": "$TEST_TMPDIR",
-    },
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    size = "small",
-    deps = [
-        "//deps/amqp10_common:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_auth_backend_cache/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_cache/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -57,19 +58,24 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_auth_backend_cache"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_auth_backend_cache_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "rabbit_auth_cache_SUITE",
+        runtime_deps = [
+            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_auth_backend_cache_SUITE",
-)
-
-rabbitmq_suite(
-    name = "rabbit_auth_cache_SUITE",
-    runtime_deps = [
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_auth_backend_http/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_http/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -64,26 +65,31 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_auth_backend_http"

-rabbitmq_suite(
-    name = "auth_SUITE",
-    size = "small",
-    additional_srcs = [
-        "test/auth_http_mock.erl",
-    ],
-    runtime_deps = [
-        "@cowboy//:bazel_erlang_lib",
-    ],
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_suite(
+        name = "auth_SUITE",
+        size = "small",
+        additional_srcs = [
+            "test/auth_http_mock.erl",
+        ],
+        runtime_deps = [
+            "@cowboy//:bazel_erlang_lib",
+        ],
+        deps = [
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "small",
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    size = "small",
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -79,30 +80,35 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_auth_backend_ldap"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        size = "small",
+        additional_srcs = [
+            "test/rabbit_ldap_seed.erl",
+        ],
+        data = [
+            "example/global.ldif",
+            "example/memberof_init.ldif",
+            "example/refint_1.ldif",
+            "example/refint_2.ldif",
+        ],
+        tags = [
+            "ldap",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "small",
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-    size = "small",
-    additional_srcs = [
-        "test/rabbit_ldap_seed.erl",
-    ],
-    data = [
-        "example/global.ldif",
-        "example/memberof_init.ldif",
-        "example/refint_1.ldif",
-        "example/refint_2.ldif",
-    ],
-    tags = [
-        "ldap",
-    ],
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    size = "small",
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_oauth2/BUILD.bazel
@ -5,6 +5,7 @@ load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -60,60 +61,61 @@ erlc(

 PACKAGE = "deps/rabbitmq_auth_backend_oauth2"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "add_uaa_key_command_SUITE",
-    size = "small",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "add_uaa_key_command_SUITE",
+        size = "small",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "jwks_SUITE",
+        additional_beam = [
+            ":rabbit_auth_backend_oauth2_test_util",
+        ],
+        additional_srcs = [
+            "test/jwks_http_app.erl",
+            "test/jwks_http_handler.erl",
+            "test/jwks_http_sup.erl",
+        ],
+        runtime_deps = [
+            "@cowboy//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "scope_SUITE",
+        size = "small",
+        deps = [
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        size = "small",
+        additional_beam = [
+            ":rabbit_auth_backend_oauth2_test_util",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "unit_SUITE",
+        size = "small",
+        additional_beam = [
+            ":rabbit_auth_backend_oauth2_test_util",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "wildcard_match_SUITE",
+        size = "small",
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "jwks_SUITE",
-    additional_beam = [
-        ":rabbit_auth_backend_oauth2_test_util",
-    ],
-    additional_srcs = [
-        "test/jwks_http_app.erl",
-        "test/jwks_http_handler.erl",
-        "test/jwks_http_sup.erl",
-    ],
-    runtime_deps = [
-        "@cowboy//:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_suite(
-    name = "scope_SUITE",
-    size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-    size = "small",
-    additional_beam = [
-        ":rabbit_auth_backend_oauth2_test_util",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "unit_SUITE",
-    size = "small",
-    additional_beam = [
-        ":rabbit_auth_backend_oauth2_test_util",
-    ],
-)
-
-rabbitmq_suite(
-    name = "wildcard_match_SUITE",
-    size = "small",
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
+++ b/deps/rabbitmq_consistent_hash_exchange/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -44,7 +45,14 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_consistent_hash_exchange"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_exchange_type_consistent_hash_SUITE",
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_exchange_type_consistent_hash_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_event_exchange/BUILD.bazel
+++ b/deps/rabbitmq_event_exchange/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -36,19 +37,24 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_event_exchange"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        runtime_deps = [
+            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    runtime_deps = [
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_federation/BUILD.bazel
+++ b/deps/rabbitmq_federation/BUILD.bazel
@ -1,11 +1,11 @@
 load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
-load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -73,50 +73,61 @@ erlc(

 PACKAGE = "deps/rabbitmq_federation"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "exchange_SUITE",
-    additional_beam = [
-        ":rabbit_federation_test_util",
-    ],
-    flaky = True,
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "exchange_SUITE",
+        additional_beam = [
+            ":rabbit_federation_test_util",
+        ],
+        flaky = True,
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "federation_status_command_SUITE",
+        additional_beam = [
+            ":rabbit_federation_test_util",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "queue_SUITE",
+        additional_beam = [
+            ":rabbit_federation_test_util",
+        ],
+        flaky = True,
+        shard_count = 6,
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_federation_status_SUITE",
+        additional_beam = [
+            ":rabbit_federation_test_util",
+            ":exchange_SUITE_beam_files",
+            ":queue_SUITE_beam_files",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "restart_federation_link_command_SUITE",
+        additional_beam = [
+            ":rabbit_federation_test_util",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "unit_inbroker_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        deps = [
+            "//deps/amqp_client:bazel_erlang_lib",
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "federation_status_command_SUITE",
-    additional_beam = [
-        ":rabbit_federation_test_util",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "queue_SUITE",
-    additional_beam = [
-        ":rabbit_federation_test_util",
-    ],
-    flaky = True,
-    shard_count = 6,
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "restart_federation_link_command_SUITE",
-    additional_beam = [
-        ":rabbit_federation_test_util",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "unit_inbroker_SUITE",
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    deps = [
-        "//deps/amqp_client:bazel_erlang_lib",
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_federation_management/BUILD.bazel
+++ b/deps/rabbitmq_federation_management/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -50,7 +51,14 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_federation_management"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "federation_mgmt_SUITE",
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "federation_mgmt_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_jms_topic_exchange/BUILD.bazel
+++ b/deps/rabbitmq_jms_topic_exchange/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -43,21 +44,26 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_jms_topic_exchange"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rjms_topic_selector_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rjms_topic_selector_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "rjms_topic_selector_unit_SUITE",
+        size = "small",
+        deps = [
+            "//deps/amqp_client:bazel_erlang_lib",
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "sjx_evaluation_SUITE",
+        size = "small",
+    ),
+]

-rabbitmq_suite(
-    name = "rjms_topic_selector_unit_SUITE",
-    size = "small",
-    deps = [
-        "//deps/amqp_client:bazel_erlang_lib",
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_suite(
-    name = "sjx_evaluation_SUITE",
-    size = "small",
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_management/BUILD.bazel
+++ b/deps/rabbitmq_management/BUILD.bazel
@ -4,6 +4,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -86,110 +87,105 @@ erlc(
    ],
 )

-rabbitmq_suite(
-    name = "cache_SUITE",
-    size = "small",
-    runtime_deps = [
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
-    deps = [
-        "@proper//:bazel_erlang_lib",
-    ],
-)
-
 PACKAGE = "deps/rabbitmq_management"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "clustering_prop_SUITE",
-    size = "large",
-    deps = [
-        "//deps/rabbitmq_management_agent:bazel_erlang_lib",
-        "@proper//:bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_suite(
+        name = "cache_SUITE",
+        size = "small",
+        runtime_deps = [
+            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+        ],
+        deps = [
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "clustering_prop_SUITE",
+        size = "large",
+        deps = [
+            "//deps/rabbitmq_management_agent:bazel_erlang_lib",
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "clustering_SUITE",
+        flaky = True,
+        deps = [
+            "//deps/rabbitmq_management_agent:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+        size = "small",
+    ),
+    rabbitmq_suite(
+        name = "listener_config_SUITE",
+        size = "small",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_mgmt_http_health_checks_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_mgmt_http_SUITE",
+        size = "large",
+        additional_beam = [
+            ":rabbit_mgmt_runtime_parameters_util",
+        ],
+        shard_count = 3,
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_mgmt_only_http_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_mgmt_rabbitmqadmin_SUITE",
+        additional_beam = [
+            ":rabbit_mgmt_runtime_parameters_util",
+        ],
+        data = [
+            ":bin/rabbitmqadmin",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "rabbit_mgmt_stats_SUITE",
+        size = "small",
+        runtime_deps = [
+            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+        ],
+        deps = [
+            "//deps/rabbitmq_management_agent:bazel_erlang_lib",
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_mgmt_test_db_SUITE",
+        deps = [
+            "//deps/rabbitmq_management_agent:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "rabbit_mgmt_test_unit_SUITE",
+        size = "small",
+    ),
+    rabbitmq_suite(
+        name = "stats_SUITE",
+        size = "small",
+        deps = [
+            "//deps/rabbitmq_management_agent:bazel_erlang_lib",
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "clustering_SUITE",
-    flaky = True,
-    deps = [
-        "//deps/rabbitmq_management_agent:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-    size = "small",
-)
-
-rabbitmq_suite(
-    name = "listener_config_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_mgmt_http_health_checks_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_mgmt_http_SUITE",
-    size = "large",
-    additional_beam = [
-        ":rabbit_mgmt_runtime_parameters_util",
-    ],
-    shard_count = 3,
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_mgmt_only_http_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_mgmt_rabbitmqadmin_SUITE",
-    additional_beam = [
-        ":rabbit_mgmt_runtime_parameters_util",
-    ],
-    data = [
-        ":bin/rabbitmqadmin",
-    ],
-)
-
-rabbitmq_suite(
-    name = "rabbit_mgmt_stats_SUITE",
-    size = "small",
-    runtime_deps = [
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
-    deps = [
-        "//deps/rabbitmq_management_agent:bazel_erlang_lib",
-        "@proper//:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_mgmt_test_db_SUITE",
-    deps = [
-        "//deps/rabbitmq_management_agent:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_suite(
-    name = "rabbit_mgmt_test_unit_SUITE",
-    size = "small",
-)
-
-rabbitmq_suite(
-    name = "stats_SUITE",
-    size = "small",
-    deps = [
-        "//deps/rabbitmq_management_agent:bazel_erlang_lib",
-        "@proper//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_management_agent/BUILD.bazel
+++ b/deps/rabbitmq_management_agent/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -74,33 +75,37 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_management_agent"

-rabbitmq_suite(
-    name = "exometer_slide_SUITE",
-    size = "small",
-    deps = [
-        "@proper//:bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_suite(
+        name = "exometer_slide_SUITE",
+        size = "small",
+        deps = [
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "metrics_SUITE",
+        size = "small",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_mgmt_gc_SUITE",
+        size = "small",
+    ),
+    rabbitmq_suite(
+        name = "rabbit_mgmt_slide_SUITE",
+        size = "small",
+        runtime_deps = [
+            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+        ],
+        deps = [
+            "@proper//:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "metrics_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_mgmt_gc_SUITE",
-    size = "small",
-)
-
-rabbitmq_suite(
-    name = "rabbit_mgmt_slide_SUITE",
-    size = "small",
-    runtime_deps = [
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
-    deps = [
-        "@proper//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_mqtt/BUILD.bazel
+++ b/deps/rabbitmq_mqtt/BUILD.bazel
@ -5,6 +5,7 @@ load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -95,83 +96,80 @@ erlc(

 PACKAGE = "deps/rabbitmq_mqtt"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "auth_SUITE",
-    additional_beam = [
-        ":rabbit_auth_backend_mqtt_mock",
-    ],
-    runtime_deps = [
-        "@emqttc//:bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "auth_SUITE",
+        additional_beam = [
+            ":rabbit_auth_backend_mqtt_mock",
+        ],
+        runtime_deps = [
+            "@emqttc//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "cluster_SUITE",
+        runtime_deps = [
+            "@emqttc//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "command_SUITE",
+        runtime_deps = [
+            "@emqttc//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "java_SUITE",
+        flaky = True,
+    ),
+    rabbitmq_suite(
+        name = "mqtt_machine_SUITE",
+        size = "small",
+    ),
+    rabbitmq_suite(
+        name = "processor_SUITE",
+        size = "small",
+        deps = [
+            "//deps/amqp_client:bazel_erlang_lib",
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "proxy_protocol_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "reader_SUITE",
+        runtime_deps = [
+            "@emqttc//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "retainer_SUITE",
+        runtime_deps = [
+            "@emqttc//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "util_SUITE",
+        size = "small",
+        data = [
+            "test/rabbitmq_mqtt.app",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "cluster_SUITE",
-    runtime_deps = [
-        "@emqttc//:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "command_SUITE",
-    runtime_deps = [
-        "@emqttc//:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "java_SUITE",
-    flaky = True,
-)
-
-rabbitmq_suite(
-    name = "mqtt_machine_SUITE",
-    size = "small",
-)
-
-rabbitmq_suite(
-    name = "processor_SUITE",
-    size = "small",
-    deps = [
-        "//deps/amqp_client:bazel_erlang_lib",
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "proxy_protocol_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "reader_SUITE",
-    runtime_deps = [
-        "@emqttc//:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "retainer_SUITE",
-    runtime_deps = [
-        "@emqttc//:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_suite(
-    name = "util_SUITE",
-    size = "small",
-    data = [
-        "test/rabbitmq_mqtt.app",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_peer_discovery_aws/BUILD.bazel
+++ b/deps/rabbitmq_peer_discovery_aws/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -53,36 +54,41 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_peer_discovery_aws"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-    size = "small",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+        size = "small",
+    ),
+    # NOTE: integration_SUITE requires aws credentials and a docker image.
+    # They can be supplied with:
+    # --test_env AWS_ACCESS_KEY_ID=... --test_env AWS_SECRET_ACCESS_KEY=...
+    # --test_env RABBITMQ_IMAGE=...
+    # bazel args
+    rabbitmq_suite(
+        name = "integration_SUITE",
+        size = "large",
+        additional_srcs = [
+            "test/aws_ecs_util.erl",
+        ],
+        tags = [
+            "aws",
+            "external",
+        ],
+        deps = [
+            "@rabbitmq_ct_helpers//:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "small",
+        runtime_deps = [
+            "@meck//:bazel_erlang_lib",
+        ],
+    ),
+]

-# NOTE: integration_SUITE requires aws credentials and a docker image.
-# They can be supplied with:
-# --test_env AWS_ACCESS_KEY_ID=... --test_env AWS_SECRET_ACCESS_KEY=...
-# --test_env RABBITMQ_IMAGE=...
-# bazel args
-rabbitmq_suite(
-    name = "integration_SUITE",
-    size = "large",
-    additional_srcs = [
-        "test/aws_ecs_util.erl",
-    ],
-    tags = [
-        "aws",
-        "external",
-    ],
-    deps = [
-        "@rabbitmq_ct_helpers//:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    size = "small",
-    runtime_deps = [
-        "@meck//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_peer_discovery_common/BUILD.bazel
+++ b/deps/rabbitmq_peer_discovery_common/BUILD.bazel
@ -5,6 +5,7 @@ load(
    "RABBITMQ_DIALYZER_OPTS",
    "RABBITMQ_ERLC_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -65,7 +66,14 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_peer_discovery_common"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_peer_discovery_consul/BUILD.bazel
+++ b/deps/rabbitmq_peer_discovery_consul/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -44,15 +45,21 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_peer_discovery_consul"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "rabbitmq_peer_discovery_consul_SUITE",
+        size = "small",
+        runtime_deps = [
+            "@meck//:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_suite(
-    name = "rabbitmq_peer_discovery_consul_SUITE",
-    size = "small",
-    runtime_deps = [
-        "@meck//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
+++ b/deps/rabbitmq_peer_discovery_etcd/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -46,18 +47,23 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_peer_discovery_etcd"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        size = "small",
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "small",
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-    size = "small",
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    size = "small",
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
+++ b/deps/rabbitmq_peer_discovery_k8s/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -44,15 +45,21 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_peer_discovery_k8s"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "rabbitmq_peer_discovery_k8s_SUITE",
+        size = "small",
+        runtime_deps = [
+            "@meck//:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_suite(
-    name = "rabbitmq_peer_discovery_k8s_SUITE",
-    size = "small",
-    runtime_deps = [
-        "@meck//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_prometheus/BUILD.bazel
+++ b/deps/rabbitmq_prometheus/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -52,14 +53,20 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_prometheus"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_prometheus_http_SUITE",
+        size = "small",
+        flaky = True,
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_prometheus_http_SUITE",
-    size = "small",
-    flaky = True,
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_recent_history_exchange/BUILD.bazel
+++ b/deps/rabbitmq_recent_history_exchange/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -39,7 +40,14 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_recent_history_exchange"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_sharding/BUILD.bazel
+++ b/deps/rabbitmq_sharding/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -35,15 +36,21 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_sharding"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_hash_exchange_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_hash_exchange_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_sharding_SUITE",
+        deps = [
+            "//deps/rabbit:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_sharding_SUITE",
-    deps = [
-        "//deps/rabbit:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_shovel/BUILD.bazel
+++ b/deps/rabbitmq_shovel/BUILD.bazel
@ -7,6 +7,7 @@ load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
    "rabbitmq_suite",
@ -94,65 +95,69 @@ erlc(

 PACKAGE = "deps/rabbitmq_shovel"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "amqp10_dynamic_SUITE",
-    additional_beam = [
-        ":shovel_test_utils",
-    ],
-    flaky = True,
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "amqp10_dynamic_SUITE",
+        additional_beam = [
+            ":shovel_test_utils",
+        ],
+        flaky = True,
+    ),
+    rabbitmq_suite(
+        name = "amqp10_shovel_SUITE",
+        size = "small",
+        runtime_deps = [
+            "@meck//:bazel_erlang_lib",
+        ],
+        deps = [
+            "//deps/amqp10_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "amqp10_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "config_SUITE",
+        size = "small",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "configuration_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "delete_shovel_command_SUITE",
+        additional_beam = [
+            ":shovel_test_utils",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "dynamic_SUITE",
+        additional_beam = [
+            ":shovel_test_utils",
+        ],
+        flaky = True,
+    ),
+    rabbitmq_suite(
+        name = "parameters_SUITE",
+        size = "small",
+        deps = [
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "shovel_status_command_SUITE",
+        additional_beam = [
+            ":shovel_test_utils",
+        ],
+    ),
+]

-rabbitmq_suite(
-    name = "amqp10_shovel_SUITE",
-    size = "small",
-    runtime_deps = [
-        "@meck//:bazel_erlang_lib",
-    ],
-    deps = [
-        "//deps/amqp10_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_suite(
-    name = "config_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "configuration_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "delete_shovel_command_SUITE",
-    additional_beam = [
-        ":shovel_test_utils",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "dynamic_SUITE",
-    additional_beam = [
-        ":shovel_test_utils",
-    ],
-    flaky = True,
-)
-
-rabbitmq_suite(
-    name = "parameters_SUITE",
-    size = "small",
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "shovel_status_command_SUITE",
-    additional_beam = [
-        ":shovel_test_utils",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_shovel_management/BUILD.bazel
+++ b/deps/rabbitmq_shovel_management/BUILD.bazel
@ -5,6 +5,7 @@ load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
 )
@ -60,7 +61,14 @@ rabbitmq_run(

 PACKAGE = "deps/rabbitmq_shovel_management"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "http_SUITE",
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "http_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_stomp/BUILD.bazel
+++ b/deps/rabbitmq_stomp/BUILD.bazel
@ -1,11 +1,11 @@
 load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
-load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -92,74 +92,73 @@ erlc(
    ],
 )

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "command_SUITE",
-    size = "small",
-    additional_beam = [
-        ":rabbit_stomp_client",
-    ],
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "command_SUITE",
+        size = "small",
+        additional_beam = [
+            ":rabbit_stomp_client",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+        size = "small",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "connections_SUITE",
+        additional_beam = [
+            ":rabbit_stomp_client",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "frame_SUITE",
+        size = "small",
+        deps = [
+            "//deps/amqp_client:bazel_erlang_lib",
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "proxy_protocol_SUITE",
+        size = "small",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "python_SUITE",
+        flaky = True,
+        shard_count = 3,
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        size = "small",
+        additional_beam = [
+            ":rabbit_stomp_client",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "topic_SUITE",
+        size = "small",
+        additional_beam = [
+            ":rabbit_stomp_client",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "util_SUITE",
+        size = "small",
+        deps = [
+            "//deps/amqp_client:bazel_erlang_lib",
+            "//deps/rabbit_common:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "connections_SUITE",
-    additional_beam = [
-        ":rabbit_stomp_client",
-    ],
-)
-
-rabbitmq_suite(
-    name = "frame_SUITE",
-    size = "small",
-    deps = [
-        "//deps/amqp_client:bazel_erlang_lib",
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "proxy_protocol_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "python_SUITE",
-    flaky = True,
-    shard_count = 3,
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-    size = "small",
-    additional_beam = [
-        ":rabbit_stomp_client",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "topic_SUITE",
-    size = "small",
-    additional_beam = [
-        ":rabbit_stomp_client",
-    ],
-)
-
-rabbitmq_suite(
-    name = "util_SUITE",
-    size = "small",
-    deps = [
-        "//deps/amqp_client:bazel_erlang_lib",
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_stream/BUILD.bazel
+++ b/deps/rabbitmq_stream/BUILD.bazel
@ -1,9 +1,9 @@
-load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -63,29 +63,34 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_stream"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "commands_SUITE",
-    additional_beam = [
-        ":rabbit_stream_SUITE_beam_files",
-    ],
-    data = glob(["test/rabbit_stream_SUITE_data/**/*"]),
-    flaky = True,
-    deps = [
-        "//deps/rabbitmq_stream_common:bazel_erlang_lib",
-    ],
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "commands_SUITE",
+        additional_beam = [
+            ":rabbit_stream_SUITE_beam_files",
+        ],
+        data = glob(["test/rabbit_stream_SUITE_data/**/*"]),
+        flaky = True,
+        deps = [
+            "//deps/rabbitmq_stream_common:bazel_erlang_lib",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_stream_SUITE",
+        deps = [
+            "//deps/rabbit:bazel_erlang_lib",
+            "//deps/rabbitmq_stream_common:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_stream_SUITE",
-    deps = [
-        "//deps/rabbit:bazel_erlang_lib",
-        "//deps/rabbitmq_stream_common:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_stream_common/BUILD.bazel
+++ b/deps/rabbitmq_stream_common/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "rabbitmq_lib",
    "rabbitmq_suite",
 )
@ -11,13 +12,9 @@ APP_NAME = "rabbitmq_stream_common"

 APP_DESCRIPTION = "RabbitMQ Stream Common"

-DEPS = [
-]
-
 rabbitmq_lib(
    app_description = APP_DESCRIPTION,
    app_name = APP_NAME,
-    deps = DEPS,
 )

 xref(tags = ["xref"])
@ -28,6 +25,13 @@ dialyze(
    tags = ["dialyze"],
 )

-rabbitmq_suite(
-    name = "rabbit_stream_core_SUITE",
+suites = [
+    rabbitmq_suite(
+        name = "rabbit_stream_core_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_stream_management/BUILD.bazel
+++ b/deps/rabbitmq_stream_management/BUILD.bazel
@ -5,6 +5,7 @@ load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
 )
@ -59,7 +60,14 @@ rabbitmq_run(

 PACKAGE = "deps/rabbitmq_stream_management"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "http_SUITE",
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "http_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_tracing/BUILD.bazel
+++ b/deps/rabbitmq_tracing/BUILD.bazel
@ -3,6 +3,7 @@ load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -56,7 +57,14 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_tracing"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_tracing_SUITE",
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_tracing_SUITE",
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_trust_store/BUILD.bazel
+++ b/deps/rabbitmq_trust_store/BUILD.bazel
@ -1,4 +1,3 @@
-load("@bazel-erlang//:ct.bzl", "ct_group_matrix")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze", "plt")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
@ -6,6 +5,7 @@ load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
 )
@ -79,17 +79,23 @@ rabbitmq_run(

 PACKAGE = "deps/rabbitmq_trust_store"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        flaky = True,
+        runtime_deps = [
+            "@ct_helper//:bazel_erlang_lib",
+            "@trust_store_http//:bazel_erlang_lib",
+        ],
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "system_SUITE",
-    flaky = True,
-    runtime_deps = [
-        "@ct_helper//:bazel_erlang_lib",
-        "@trust_store_http//:bazel_erlang_lib",
-    ],
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_web_dispatch/BUILD.bazel
+++ b/deps/rabbitmq_web_dispatch/BUILD.bazel
@ -7,6 +7,7 @@ load(
    "//:rabbitmq.bzl",
    "APP_VERSION",
    "RABBITMQ_DIALYZER_OPTS",
+    "assert_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_suite",
 )
@ -79,12 +80,18 @@ rabbitmq_run(

 PACKAGE = "deps/rabbitmq_web_dispatch"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "rabbit_web_dispatch_SUITE",
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "rabbit_web_dispatch_SUITE",
+    ),
+    rabbitmq_suite(
+        name = "rabbit_web_dispatch_unit_SUITE",
+        size = "small",
+    ),
+]

-rabbitmq_suite(
-    name = "rabbit_web_dispatch_unit_SUITE",
-    size = "small",
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_web_mqtt/BUILD.bazel
+++ b/deps/rabbitmq_web_mqtt/BUILD.bazel
@ -1,8 +1,11 @@
+load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlc")
 load("@bazel-erlang//:xref.bzl", "xref")
 load("@bazel-erlang//:dialyze.bzl", "dialyze")
 load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
+    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -60,17 +63,36 @@ broker_for_integration_suites()

 PACKAGE = "deps/rabbitmq_web_mqtt"

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
+erlc(
+    name = "test_utils",
+    srcs = glob(["test/src/*.erl"]),
+    hdrs = glob(["test/src/*.hrl"]),
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
 )

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "proxy_protocol_SUITE",
-    additional_hdrs = glob(["test/src/*.hrl"]),
-    additional_srcs = glob(["test/src/*.erl"]),
-    erlc_opts = [
-        "-I deps/rabbitmq_web_mqtt/test",
-    ],
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "proxy_protocol_SUITE",
+        additional_beam = [":test_utils"],
+        additional_hdrs = glob(["test/src/*.hrl"]),
+        erlc_opts = [
+            "-I deps/rabbitmq_web_mqtt/test",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "system_SUITE",
+        additional_beam = [":test_utils"],
+        additional_hdrs = glob(["test/src/*.hrl"]),
+    ),
+]
+
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )
--- a/deps/rabbitmq_web_mqtt/test/src/system_SUITE.erl
+++ b/deps/rabbitmq_web_mqtt/test/src/system_SUITE.erl
@ -8,7 +8,7 @@
 -module(system_SUITE).

 -include_lib("eunit/include/eunit.hrl").
-include("emqttc_packet.hrl").
+-include("src/emqttc_packet.hrl").

 -compile(export_all).

--- a/deps/rabbitmq_web_stomp/BUILD.bazel
+++ b/deps/rabbitmq_web_stomp/BUILD.bazel
@ -5,6 +5,7 @@ load(
    "//:rabbitmq.bzl",
    "RABBITMQ_DIALYZER_OPTS",
    "RABBITMQ_TEST_ERLC_OPTS",
+    "assert_suites",
    "broker_for_integration_suites",
    "rabbitmq_integration_suite",
    "rabbitmq_lib",
@ -73,44 +74,46 @@ erlc(
    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
 )

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "amqp_stomp_SUITE",
-    additional_beam = [
-        ":test_util",
-    ],
-)
+suites = [
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "amqp_stomp_SUITE",
+        additional_beam = [
+            ":test_util",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "config_schema_SUITE",
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "cowboy_websocket_SUITE",
+        additional_beam = [
+            ":test_util",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "proxy_protocol_SUITE",
+        additional_beam = [
+            ":test_util",
+        ],
+    ),
+    rabbitmq_integration_suite(
+        PACKAGE,
+        name = "raw_websocket_SUITE",
+        additional_beam = [
+            ":test_util",
+        ],
+    ),
+    rabbitmq_suite(
+        name = "unit_SUITE",
+        size = "small",
+    ),
+]

-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "config_schema_SUITE",
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "cowboy_websocket_SUITE",
-    additional_beam = [
-        ":test_util",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "proxy_protocol_SUITE",
-    additional_beam = [
-        ":test_util",
-    ],
-)
-
-rabbitmq_integration_suite(
-    PACKAGE,
-    name = "raw_websocket_SUITE",
-    additional_beam = [
-        ":test_util",
-    ],
-)
-
-rabbitmq_suite(
-    name = "unit_SUITE",
-    size = "small",
+assert_suites(
+    suites,
+    glob(["test/**/*_SUITE.erl"]),
 )