diff --git a/.github/workflows/test-make-target.yaml b/.github/workflows/test-make-target.yaml
index 4d9e466dc3..690904c211 100644
--- a/.github/workflows/test-make-target.yaml
+++ b/.github/workflows/test-make-target.yaml
@@ -90,6 +90,7 @@ jobs:
     - name: RUN TESTS
       if: inputs.plugin != 'rabbitmq_cli'
       run: |
+        sudo netstat -ntp
         make -C deps/${{ inputs.plugin }} ${{ inputs.make_target }} RABBITMQ_METADATA_STORE=${{ inputs.metadata_store }}
 
     # rabbitmq_cli needs a correct broker version for two of its tests.
diff --git a/deps/rabbit/test/amqp_auth_SUITE.erl b/deps/rabbit/test/amqp_auth_SUITE.erl
index 5889cbdd50..389a37b2d5 100644
--- a/deps/rabbit/test/amqp_auth_SUITE.erl
+++ b/deps/rabbit/test/amqp_auth_SUITE.erl
@@ -120,12 +120,17 @@ init_per_group(Group, Config0) ->
                Config1,
                rabbit_ct_broker_helpers:setup_steps() ++
                rabbit_ct_client_helpers:setup_steps()),
-    Vhost = <<"test vhost">>,
-    User = <<"test user">>,
-    ok = rabbit_ct_broker_helpers:add_vhost(Config, Vhost),
-    ok = rabbit_ct_broker_helpers:add_user(Config, User),
-    [{test_vhost, Vhost},
-     {test_user, User}] ++ Config.
+    case Config of
+        _ when is_list(Config) ->
+            Vhost = <<"test vhost">>,
+            User = <<"test user">>,
+            ok = rabbit_ct_broker_helpers:add_vhost(Config, Vhost),
+            ok = rabbit_ct_broker_helpers:add_user(Config, User),
+            [{test_vhost, Vhost},
+             {test_user, User}] ++ Config;
+        {skip, _} = Skip ->
+            Skip
+    end.
 
 end_per_group(_Group, Config) ->
     ok = rabbit_ct_broker_helpers:delete_user(Config, ?config(test_user, Config)),
diff --git a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
index d56e5c8b09..d9ff47230b 100644
--- a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
+++ b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
@@ -2743,7 +2743,7 @@ retry_if_coordinator_unavailable(Config, Server, Cmd, Retry) ->
             case re:run(Msg, ".*coordinator_unavailable.*", [{capture, none}]) of
                 match ->
                     ct:pal("Attempt to execute command ~p failed, coordinator unavailable", [Cmd]),
-                    retry_if_coordinator_unavailable(Config, Ch, Cmd, Retry - 1);
+                    retry_if_coordinator_unavailable(Config, Server, Cmd, Retry - 1);
                 _ ->
                     exit(Error)
             end
diff --git a/deps/rabbit/test/unit_credit_flow_SUITE.erl b/deps/rabbit/test/unit_credit_flow_SUITE.erl
index 189d028729..bdc3a0679b 100644
--- a/deps/rabbit/test/unit_credit_flow_SUITE.erl
+++ b/deps/rabbit/test/unit_credit_flow_SUITE.erl
@@ -11,6 +11,9 @@
 
 -compile(export_all).
 
+suite() ->
+    [{timetrap, {minutes, 3}}].
+
 all() ->
     [
       {group, sequential_tests}