Mixed version testing skip updates

(cherry picked from commit 3cb8ff1)

Author: HoloRin

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -34,9 +34,9 @@ all() ->
 
 groups() ->
     [
-     {single_node, [], all_tests()},
-     {single_node, [], memory_tests()},
-     {single_node, [], [node_removal_is_quorum_critical]},
+     {single_node, [], all_tests()
+                       ++ memory_tests()
+                       ++ [node_removal_is_quorum_critical]},
      {unclustered, [], [
                         {uncluster_size_2, [], [add_member]}
                        ]},
@@ -264,6 +264,8 @@ init_per_testcase(Testcase, Config) ->
     case Testcase of
         simple_confirm_availability_on_leader_change when IsMixed ->
             {skip, "simple_confirm_availability_on_leader_change isn't mixed versions compatible"};
+        confirm_availability_on_leader_change when IsMixed ->
+            {skip, "confirm_availability_on_leader_change isn't mixed versions compatible"};
         _ ->
             Config1 = rabbit_ct_helpers:testcase_started(Config, Testcase),
             rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_queues, []),