diff --git a/big_tests/default.spec b/big_tests/default.spec
index a60cf40499..ec52198652 100644
--- a/big_tests/default.spec
+++ b/big_tests/default.spec
@@ -9,119 +9,122 @@
 %% http://www.erlang.org/doc/apps/common_test/run_test_chapter.html#test_specifications
 {include, "tests"}.
 
-{suites, "tests", mim_c2s_SUITE}.
+{groups, "tests", sm_SUITE, [[tcp_tests, parallel_unacknowledged_message_hook]], {cases, [unacknowledged_message_hook_filter]}
+}.
 
-{suites, "tests", acc_e2e_SUITE}.
-{suites, "tests", accounts_SUITE}.
-{suites, "tests", adhoc_SUITE}.
-{suites, "tests", amp_big_SUITE}.
-{suites, "tests", anonymous_SUITE}.
-{suites, "tests", bind2_SUITE}.
-{suites, "tests", fast_auth_token_SUITE}.
-{suites, "tests", bosh_SUITE}.
-{suites, "tests", carboncopy_SUITE}.
-{suites, "tests", connect_SUITE}.
-{suites, "tests", disco_and_caps_SUITE}.
-{suites, "tests", extdisco_SUITE}.
-{suites, "tests", gdpr_SUITE}.
-{suites, "tests", graphql_SUITE}.
-{suites, "tests", graphql_sse_SUITE}.
-{suites, "tests", graphql_account_SUITE}.
-{suites, "tests", graphql_domain_SUITE}.
-{suites, "tests", graphql_inbox_SUITE}.
-{suites, "tests", graphql_last_SUITE}.
-{suites, "tests", graphql_muc_SUITE}.
-{suites, "tests", graphql_muc_light_SUITE}.
-{suites, "tests", graphql_offline_SUITE}.
-{suites, "tests", graphql_private_SUITE}.
-{suites, "tests", graphql_roster_SUITE}.
-{suites, "tests", graphql_session_SUITE}.
-{suites, "tests", graphql_stanza_SUITE}.
-{suites, "tests", graphql_stats_SUITE}.
-{suites, "tests", graphql_gdpr_SUITE}.
-{suites, "tests", graphql_token_SUITE}.
-{suites, "tests", graphql_mnesia_SUITE}.
-{suites, "tests", graphql_cets_SUITE}.
-{suites, "tests", graphql_vcard_SUITE}.
-{suites, "tests", graphql_http_upload_SUITE}.
-{suites, "tests", graphql_metric_SUITE}.
-{suites, "tests", inbox_SUITE}.
-{suites, "tests", inbox_extensions_SUITE}.
-{suites, "tests", login_SUITE}.
-{suites, "tests", mam_SUITE}.
-{suites, "tests", mam_proper_SUITE}.
-{suites, "tests", mam_send_message_SUITE}.
-{suites, "tests", metrics_c2s_SUITE}.
-{suites, "tests", metrics_roster_SUITE}.
-{suites, "tests", metrics_session_SUITE}.
-{suites, "tests", mod_blocking_SUITE}.
-{suites, "tests", mod_event_pusher_http_SUITE}.
-{suites, "tests", mod_event_pusher_rabbit_SUITE}.
-{suites, "tests", mod_event_pusher_sns_SUITE}.
-{suites, "tests", mod_http_upload_SUITE}.
-{suites, "tests", mod_ping_SUITE}.
-{suites, "tests", mod_time_SUITE}.
-{suites, "tests", mod_version_SUITE}.
-{suites, "tests", mongoose_cassandra_SUITE}.
-{suites, "tests", mongoose_elasticsearch_SUITE}.
-{suites, "tests", mongooseimctl_SUITE}.
-{suites, "tests", muc_SUITE}.
-{suites, "tests", muc_http_api_SUITE}.
-{suites, "tests", muc_light_SUITE}.
-{suites, "tests", muc_light_http_api_SUITE}.
-{suites, "tests", muc_light_legacy_SUITE}.
-{suites, "tests", oauth_SUITE}.
-{suites, "tests", offline_SUITE}.
-{suites, "tests", offline_stub_SUITE}.
-{suites, "tests", pep_SUITE}.
-{suites, "tests", presence_SUITE}.
-{suites, "tests", privacy_SUITE}.
-{suites, "tests", private_SUITE}.
-{suites, "tests", pubsub_SUITE}.
-{suites, "tests", pubsub_s2s_SUITE}.
-{suites, "tests", push_SUITE}.
-{suites, "tests", push_http_SUITE}.
-{suites, "tests", push_integration_SUITE}.
-{suites, "tests", push_pubsub_SUITE}.
-{suites, "tests", race_conditions_SUITE}.
-{suites, "tests", rdbms_SUITE}.
-{suites, "tests", rest_SUITE}.
-{suites, "tests", rest_client_SUITE}.
-{suites, "tests", sasl_SUITE}.
-{suites, "tests", sasl2_SUITE}.
-{suites, "tests", shared_roster_SUITE}.
-{suites, "tests", sic_SUITE}.
-{suites, "tests", smart_markers_SUITE}.
-{suites, "tests", sm_SUITE}.
-{suites, "tests", vcard_SUITE}.
-{suites, "tests", vcard_simple_SUITE}.
-{suites, "tests", websockets_SUITE}.
-{suites, "tests", xep_0352_csi_SUITE}.
-{suites, "tests", domain_isolation_SUITE}.
-{suites, "tests", domain_removal_SUITE}.
-{suites, "tests", cets_disco_SUITE}.
-{suites, "tests", start_node_id_SUITE}.
-{suites, "tests", tr_util_SUITE}.
+%% {suites, "tests", mim_c2s_SUITE}.
 
-%% the below suites restart MIM nodes, so they were moved to the end
-%% to minimise impact on other tests
-{suites, "tests", auth_methods_for_c2s_SUITE}.
-{suites, "tests", cluster_commands_SUITE}.
-{suites, "tests", component_SUITE}.
-{suites, "tests", dynamic_domains_SUITE}.
-{suites, "tests", graphql_server_SUITE}.
-{suites, "tests", jingle_SUITE}.
-{suites, "tests", last_SUITE}.
-{suites, "tests", local_iq_SUITE}.
-{suites, "tests", metrics_api_SUITE}.
-{suites, "tests", mod_global_distrib_SUITE}.
-{suites, "tests", persistent_cluster_id_SUITE}.
-{suites, "tests", s2s_SUITE}.
-{suites, "tests", sasl_external_SUITE}.
-{suites, "tests", service_domain_db_SUITE}.
-{suites, "tests", service_mongoose_system_metrics_SUITE}.
-{suites, "tests", shutdown_SUITE}.
-{suites, "tests", system_probes_SUITE}.
+%% {suites, "tests", acc_e2e_SUITE}.
+%% {suites, "tests", accounts_SUITE}.
+%% {suites, "tests", adhoc_SUITE}.
+%% {suites, "tests", amp_big_SUITE}.
+%% {suites, "tests", anonymous_SUITE}.
+%% {suites, "tests", bind2_SUITE}.
+%% {suites, "tests", fast_auth_token_SUITE}.
+%% {suites, "tests", bosh_SUITE}.
+%% {suites, "tests", carboncopy_SUITE}.
+%% {suites, "tests", connect_SUITE}.
+%% {suites, "tests", disco_and_caps_SUITE}.
+%% {suites, "tests", extdisco_SUITE}.
+%% {suites, "tests", gdpr_SUITE}.
+%% {suites, "tests", graphql_SUITE}.
+%% {suites, "tests", graphql_sse_SUITE}.
+%% {suites, "tests", graphql_account_SUITE}.
+%% {suites, "tests", graphql_domain_SUITE}.
+%% {suites, "tests", graphql_inbox_SUITE}.
+%% {suites, "tests", graphql_last_SUITE}.
+%% {suites, "tests", graphql_muc_SUITE}.
+%% {suites, "tests", graphql_muc_light_SUITE}.
+%% {suites, "tests", graphql_offline_SUITE}.
+%% {suites, "tests", graphql_private_SUITE}.
+%% {suites, "tests", graphql_roster_SUITE}.
+%% {suites, "tests", graphql_session_SUITE}.
+%% {suites, "tests", graphql_stanza_SUITE}.
+%% {suites, "tests", graphql_stats_SUITE}.
+%% {suites, "tests", graphql_gdpr_SUITE}.
+%% {suites, "tests", graphql_token_SUITE}.
+%% {suites, "tests", graphql_mnesia_SUITE}.
+%% {suites, "tests", graphql_cets_SUITE}.
+%% {suites, "tests", graphql_vcard_SUITE}.
+%% {suites, "tests", graphql_http_upload_SUITE}.
+%% {suites, "tests", graphql_metric_SUITE}.
+%% {suites, "tests", inbox_SUITE}.
+%% {suites, "tests", inbox_extensions_SUITE}.
+%% {suites, "tests", login_SUITE}.
+%% {suites, "tests", mam_SUITE}.
+%% {suites, "tests", mam_proper_SUITE}.
+%% {suites, "tests", mam_send_message_SUITE}.
+%% {suites, "tests", metrics_c2s_SUITE}.
+%% {suites, "tests", metrics_roster_SUITE}.
+%% {suites, "tests", metrics_session_SUITE}.
+%% {suites, "tests", mod_blocking_SUITE}.
+%% {suites, "tests", mod_event_pusher_http_SUITE}.
+%% {suites, "tests", mod_event_pusher_rabbit_SUITE}.
+%% {suites, "tests", mod_event_pusher_sns_SUITE}.
+%% {suites, "tests", mod_http_upload_SUITE}.
+%% {suites, "tests", mod_ping_SUITE}.
+%% {suites, "tests", mod_time_SUITE}.
+%% {suites, "tests", mod_version_SUITE}.
+%% {suites, "tests", mongoose_cassandra_SUITE}.
+%% {suites, "tests", mongoose_elasticsearch_SUITE}.
+%% {suites, "tests", mongooseimctl_SUITE}.
+%% {suites, "tests", muc_SUITE}.
+%% {suites, "tests", muc_http_api_SUITE}.
+%% {suites, "tests", muc_light_SUITE}.
+%% {suites, "tests", muc_light_http_api_SUITE}.
+%% {suites, "tests", muc_light_legacy_SUITE}.
+%% {suites, "tests", oauth_SUITE}.
+%% {suites, "tests", offline_SUITE}.
+%% {suites, "tests", offline_stub_SUITE}.
+%% {suites, "tests", pep_SUITE}.
+%% {suites, "tests", presence_SUITE}.
+%% {suites, "tests", privacy_SUITE}.
+%% {suites, "tests", private_SUITE}.
+%% {suites, "tests", pubsub_SUITE}.
+%% {suites, "tests", pubsub_s2s_SUITE}.
+%% {suites, "tests", push_SUITE}.
+%% {suites, "tests", push_http_SUITE}.
+%% {suites, "tests", push_integration_SUITE}.
+%% {suites, "tests", push_pubsub_SUITE}.
+%% {suites, "tests", race_conditions_SUITE}.
+%% {suites, "tests", rdbms_SUITE}.
+%% {suites, "tests", rest_SUITE}.
+%% {suites, "tests", rest_client_SUITE}.
+%% {suites, "tests", sasl_SUITE}.
+%% {suites, "tests", sasl2_SUITE}.
+%% {suites, "tests", shared_roster_SUITE}.
+%% {suites, "tests", sic_SUITE}.
+%% {suites, "tests", smart_markers_SUITE}.
+%% {suites, "tests", sm_SUITE}.
+%% {suites, "tests", vcard_SUITE}.
+%% {suites, "tests", vcard_simple_SUITE}.
+%% {suites, "tests", websockets_SUITE}.
+%% {suites, "tests", xep_0352_csi_SUITE}.
+%% {suites, "tests", domain_isolation_SUITE}.
+%% {suites, "tests", domain_removal_SUITE}.
+%% {suites, "tests", cets_disco_SUITE}.
+%% {suites, "tests", start_node_id_SUITE}.
+%% {suites, "tests", tr_util_SUITE}.
+
+%% %% the below suites restart MIM nodes, so they were moved to the end
+%% %% to minimise impact on other tests
+%% {suites, "tests", auth_methods_for_c2s_SUITE}.
+%% {suites, "tests", cluster_commands_SUITE}.
+%% {suites, "tests", component_SUITE}.
+%% {suites, "tests", dynamic_domains_SUITE}.
+%% {suites, "tests", graphql_server_SUITE}.
+%% {suites, "tests", jingle_SUITE}.
+%% {suites, "tests", last_SUITE}.
+%% {suites, "tests", local_iq_SUITE}.
+%% {suites, "tests", metrics_api_SUITE}.
+%% {suites, "tests", mod_global_distrib_SUITE}.
+%% {suites, "tests", persistent_cluster_id_SUITE}.
+%% {suites, "tests", s2s_SUITE}.
+%% {suites, "tests", sasl_external_SUITE}.
+%% {suites, "tests", service_domain_db_SUITE}.
+%% {suites, "tests", service_mongoose_system_metrics_SUITE}.
+%% {suites, "tests", shutdown_SUITE}.
+%% {suites, "tests", system_probes_SUITE}.
 
 {config, ["test.config"]}.
 {logdir, "ct_report"}.
diff --git a/big_tests/dynamic_domains.spec b/big_tests/dynamic_domains.spec
index 4b9980981e..dac78fa22b 100644
--- a/big_tests/dynamic_domains.spec
+++ b/big_tests/dynamic_domains.spec
@@ -9,119 +9,122 @@
 %% http://www.erlang.org/doc/apps/common_test/run_test_chapter.html#test_specifications
 {include, "tests"}.
 
-{suites, "tests", mim_c2s_SUITE}.
-{suites, "tests", acc_e2e_SUITE}.
-{suites, "tests", accounts_SUITE}.
-{suites, "tests", adhoc_SUITE}.
-{suites, "tests", amp_big_SUITE}.
-{suites, "tests", anonymous_SUITE}.
-{suites, "tests", bind2_SUITE}.
-{suites, "tests", fast_auth_token_SUITE}.
-{suites, "tests", bosh_SUITE}.
-{suites, "tests", carboncopy_SUITE}.
-{suites, "tests", connect_SUITE}.
-{suites, "tests", disco_and_caps_SUITE}.
-{suites, "tests", domain_isolation_SUITE}.
-{suites, "tests", extdisco_SUITE}.
+{groups, "tests", sm_SUITE, [[tcp_tests, parallel_unacknowledged_message_hook]], {cases, [unacknowledged_message_hook_filter]}
+}.
 
-{suites, "tests", gdpr_SUITE}.
-{skip_groups, "tests", gdpr_SUITE,
- [retrieve_personal_data_pubsub,
-  remove_personal_data_pubsub],
- "at the moment mod_pubsub doesn't support dynamic domains"}.
+%% {suites, "tests", mim_c2s_SUITE}.
+%% {suites, "tests", acc_e2e_SUITE}.
+%% {suites, "tests", accounts_SUITE}.
+%% {suites, "tests", adhoc_SUITE}.
+%% {suites, "tests", amp_big_SUITE}.
+%% {suites, "tests", anonymous_SUITE}.
+%% {suites, "tests", bind2_SUITE}.
+%% {suites, "tests", fast_auth_token_SUITE}.
+%% {suites, "tests", bosh_SUITE}.
+%% {suites, "tests", carboncopy_SUITE}.
+%% {suites, "tests", connect_SUITE}.
+%% {suites, "tests", disco_and_caps_SUITE}.
+%% {suites, "tests", domain_isolation_SUITE}.
+%% {suites, "tests", extdisco_SUITE}.
 
-{suites, "tests", graphql_SUITE}.
-{suites, "tests", graphql_sse_SUITE}.
-{suites, "tests", graphql_account_SUITE}.
-{suites, "tests", graphql_domain_SUITE}.
-{suites, "tests", graphql_inbox_SUITE}.
-{suites, "tests", graphql_last_SUITE}.
-{suites, "tests", graphql_muc_SUITE}.
-{suites, "tests", graphql_muc_light_SUITE}.
-{suites, "tests", graphql_private_SUITE}.
-{suites, "tests", graphql_roster_SUITE}.
-{suites, "tests", graphql_session_SUITE}.
-{suites, "tests", graphql_stanza_SUITE}.
-{suites, "tests", graphql_vcard_SUITE}.
-{suites, "tests", graphql_offline_SUITE}.
-{suites, "tests", graphql_stats_SUITE}.
-{suites, "tests", graphql_gdpr_SUITE}.
-{suites, "tests", graphql_token_SUITE}.
-{suites, "tests", graphql_mnesia_SUITE}.
-{suites, "tests", graphql_cets_SUITE}.
-{suites, "tests", graphql_http_upload_SUITE}.
-{suites, "tests", graphql_metric_SUITE}.
-{suites, "tests", inbox_SUITE}.
-{suites, "tests", inbox_extensions_SUITE}.
-{suites, "tests", login_SUITE}.
-{suites, "tests", mam_SUITE}.
-{suites, "tests", mam_proper_SUITE}.
-{suites, "tests", mam_send_message_SUITE}.
-{suites, "tests", metrics_c2s_SUITE}.
-{suites, "tests", metrics_roster_SUITE}.
-{suites, "tests", metrics_session_SUITE}.
-{suites, "tests", mod_blocking_SUITE}.
-{suites, "tests", mod_http_upload_SUITE}.
-{suites, "tests", mod_ping_SUITE}.
-{suites, "tests", mod_time_SUITE}.
-{suites, "tests", mod_version_SUITE}.
-{suites, "tests", mongooseimctl_SUITE}.
+%% {suites, "tests", gdpr_SUITE}.
+%% {skip_groups, "tests", gdpr_SUITE,
+%%  [retrieve_personal_data_pubsub,
+%%   remove_personal_data_pubsub],
+%%  "at the moment mod_pubsub doesn't support dynamic domains"}.
 
-{suites, "tests", muc_SUITE}.
-{skip_groups, "tests", muc_SUITE,
- [register_over_s2s],
- "at the moment S2S doesn't support dynamic domains "
- "(requires mod_register creating CT users)"}.
+%% {suites, "tests", graphql_SUITE}.
+%% {suites, "tests", graphql_sse_SUITE}.
+%% {suites, "tests", graphql_account_SUITE}.
+%% {suites, "tests", graphql_domain_SUITE}.
+%% {suites, "tests", graphql_inbox_SUITE}.
+%% {suites, "tests", graphql_last_SUITE}.
+%% {suites, "tests", graphql_muc_SUITE}.
+%% {suites, "tests", graphql_muc_light_SUITE}.
+%% {suites, "tests", graphql_private_SUITE}.
+%% {suites, "tests", graphql_roster_SUITE}.
+%% {suites, "tests", graphql_session_SUITE}.
+%% {suites, "tests", graphql_stanza_SUITE}.
+%% {suites, "tests", graphql_vcard_SUITE}.
+%% {suites, "tests", graphql_offline_SUITE}.
+%% {suites, "tests", graphql_stats_SUITE}.
+%% {suites, "tests", graphql_gdpr_SUITE}.
+%% {suites, "tests", graphql_token_SUITE}.
+%% {suites, "tests", graphql_mnesia_SUITE}.
+%% {suites, "tests", graphql_cets_SUITE}.
+%% {suites, "tests", graphql_http_upload_SUITE}.
+%% {suites, "tests", graphql_metric_SUITE}.
+%% {suites, "tests", inbox_SUITE}.
+%% {suites, "tests", inbox_extensions_SUITE}.
+%% {suites, "tests", login_SUITE}.
+%% {suites, "tests", mam_SUITE}.
+%% {suites, "tests", mam_proper_SUITE}.
+%% {suites, "tests", mam_send_message_SUITE}.
+%% {suites, "tests", metrics_c2s_SUITE}.
+%% {suites, "tests", metrics_roster_SUITE}.
+%% {suites, "tests", metrics_session_SUITE}.
+%% {suites, "tests", mod_blocking_SUITE}.
+%% {suites, "tests", mod_http_upload_SUITE}.
+%% {suites, "tests", mod_ping_SUITE}.
+%% {suites, "tests", mod_time_SUITE}.
+%% {suites, "tests", mod_version_SUITE}.
+%% {suites, "tests", mongooseimctl_SUITE}.
 
-{suites, "tests", muc_http_api_SUITE}.
-{suites, "tests", muc_light_SUITE}.
-{suites, "tests", muc_light_legacy_SUITE}.
-{suites, "tests", muc_light_http_api_SUITE}.
-{suites, "tests", oauth_SUITE}.
-{suites, "tests", offline_SUITE}.
-{suites, "tests", offline_stub_SUITE}.
-{suites, "tests", presence_SUITE}.
-{suites, "tests", privacy_SUITE}.
-{suites, "tests", private_SUITE}.
-{suites, "tests", race_conditions_SUITE}.
-{suites, "tests", rdbms_SUITE}.
-{suites, "tests", rest_SUITE}.
-{suites, "tests", rest_client_SUITE}.
-{suites, "tests", sasl_SUITE}.
-{suites, "tests", sasl2_SUITE}.
-{suites, "tests", sic_SUITE}.
-{suites, "tests", smart_markers_SUITE}.
-{suites, "tests", sm_SUITE}.
-{suites, "tests", system_probes_SUITE}.
-{suites, "tests", vcard_SUITE}.
-{suites, "tests", vcard_simple_SUITE}.
-{suites, "tests", websockets_SUITE}.
-{suites, "tests", xep_0352_csi_SUITE}.
-{suites, "tests", domain_removal_SUITE}.
-{suites, "tests", local_iq_SUITE}.
-{suites, "tests", cets_disco_SUITE}.
-{suites, "tests", start_node_id_SUITE}.
-{suites, "tests", tr_util_SUITE}.
+%% {suites, "tests", muc_SUITE}.
+%% {skip_groups, "tests", muc_SUITE,
+%%  [register_over_s2s],
+%%  "at the moment S2S doesn't support dynamic domains "
+%%  "(requires mod_register creating CT users)"}.
 
-%% the below suites restart MIM nodes, so they were moved to the end
-%% to minimise impact on other tests
-{suites, "tests", auth_methods_for_c2s_SUITE}.
-{suites, "tests", cluster_commands_SUITE}.
-{suites, "tests", component_SUITE}.
-{suites, "tests", dynamic_domains_SUITE}.
-{suites, "tests", graphql_server_SUITE}.
-{suites, "tests", last_SUITE}.
-{suites, "tests", metrics_api_SUITE}.
-{suites, "tests", persistent_cluster_id_SUITE}.
-{suites, "tests", sasl_external_SUITE}.
-{suites, "tests", service_domain_db_SUITE}.
+%% {suites, "tests", muc_http_api_SUITE}.
+%% {suites, "tests", muc_light_SUITE}.
+%% {suites, "tests", muc_light_legacy_SUITE}.
+%% {suites, "tests", muc_light_http_api_SUITE}.
+%% {suites, "tests", oauth_SUITE}.
+%% {suites, "tests", offline_SUITE}.
+%% {suites, "tests", offline_stub_SUITE}.
+%% {suites, "tests", presence_SUITE}.
+%% {suites, "tests", privacy_SUITE}.
+%% {suites, "tests", private_SUITE}.
+%% {suites, "tests", race_conditions_SUITE}.
+%% {suites, "tests", rdbms_SUITE}.
+%% {suites, "tests", rest_SUITE}.
+%% {suites, "tests", rest_client_SUITE}.
+%% {suites, "tests", sasl_SUITE}.
+%% {suites, "tests", sasl2_SUITE}.
+%% {suites, "tests", sic_SUITE}.
+%% {suites, "tests", smart_markers_SUITE}.
+%% {suites, "tests", sm_SUITE}.
+%% {suites, "tests", system_probes_SUITE}.
+%% {suites, "tests", vcard_SUITE}.
+%% {suites, "tests", vcard_simple_SUITE}.
+%% {suites, "tests", websockets_SUITE}.
+%% {suites, "tests", xep_0352_csi_SUITE}.
+%% {suites, "tests", domain_removal_SUITE}.
+%% {suites, "tests", local_iq_SUITE}.
+%% {suites, "tests", cets_disco_SUITE}.
+%% {suites, "tests", start_node_id_SUITE}.
+%% {suites, "tests", tr_util_SUITE}.
 
-{suites, "tests", service_mongoose_system_metrics_SUITE}.
-{skip_cases, "tests", service_mongoose_system_metrics_SUITE,
- [xmpp_components_are_reported],
- "at the moment external components doesn't support dynamic domains"}.
+%% %% the below suites restart MIM nodes, so they were moved to the end
+%% %% to minimise impact on other tests
+%% {suites, "tests", auth_methods_for_c2s_SUITE}.
+%% {suites, "tests", cluster_commands_SUITE}.
+%% {suites, "tests", component_SUITE}.
+%% {suites, "tests", dynamic_domains_SUITE}.
+%% {suites, "tests", graphql_server_SUITE}.
+%% {suites, "tests", last_SUITE}.
+%% {suites, "tests", metrics_api_SUITE}.
+%% {suites, "tests", persistent_cluster_id_SUITE}.
+%% {suites, "tests", sasl_external_SUITE}.
+%% {suites, "tests", service_domain_db_SUITE}.
 
-{suites, "tests", shutdown_SUITE}.
+%% {suites, "tests", service_mongoose_system_metrics_SUITE}.
+%% {skip_cases, "tests", service_mongoose_system_metrics_SUITE,
+%%  [xmpp_components_are_reported],
+%%  "at the moment external components doesn't support dynamic domains"}.
+
+%% {suites, "tests", shutdown_SUITE}.
 
 {config, ["dynamic_domains.config", "test.config"]}.
 
diff --git a/big_tests/tests/sm_SUITE.erl b/big_tests/tests/sm_SUITE.erl
index 9b6b1bf0f9..69181a6890 100644
--- a/big_tests/tests/sm_SUITE.erl
+++ b/big_tests/tests/sm_SUITE.erl
@@ -64,7 +64,7 @@ groups() ->
      {parallel_manual_ack_freq_1, [parallel], parallel_manual_ack_freq_1_cases()},
      {manual_ack_freq_2, [], manual_ack_freq_2_cases()},
      {stale_h, [], stale_h_cases()},
-     {parallel_unacknowledged_message_hook, [parallel], parallel_unacknowledged_message_hook_cases()},
+     {parallel_unacknowledged_message_hook, [parallel, {repeat_until_any_fail, 50}], parallel_unacknowledged_message_hook_cases()},
      {resume_timeout, [parallel], resume_timeout_cases()}
     ].