diff --git a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.reference b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.reference
rename to tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.reference
diff --git a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql
rename to tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
diff --git a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.reference b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.reference
rename to tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.sql b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.sql
rename to tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.reference b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.reference
rename to tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql
rename to tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.reference b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.reference
rename to tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql
rename to tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.reference b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.reference
rename to tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.sql b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.sql
rename to tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/00725_comment_columns.reference b/tests/queries/0_stateless/00725_comment_columns_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00725_comment_columns.reference
rename to tests/queries/0_stateless/00725_comment_columns_long.reference
diff --git a/tests/queries/0_stateless/00725_comment_columns.sql b/tests/queries/0_stateless/00725_comment_columns_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00725_comment_columns.sql
rename to tests/queries/0_stateless/00725_comment_columns_long.sql
diff --git a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.reference b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.reference
rename to tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.reference
diff --git a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.sql b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.sql
rename to tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference
rename to tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql
rename to tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.reference b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.reference
rename to tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql
rename to tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference
rename to tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql
rename to tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.reference b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.reference
rename to tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
similarity index 100%
rename from tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql
rename to tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
diff --git a/tests/queries/0_stateless/01319_manual_write_to_replicas.reference b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01319_manual_write_to_replicas.reference
rename to tests/queries/0_stateless/01319_manual_write_to_replicas_long.reference
diff --git a/tests/queries/0_stateless/01319_manual_write_to_replicas.sql b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
similarity index 100%
rename from tests/queries/0_stateless/01319_manual_write_to_replicas.sql
rename to tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.reference b/tests/queries/0_stateless/01669_columns_declaration_serde_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01669_columns_declaration_serde.reference
rename to tests/queries/0_stateless/01669_columns_declaration_serde_long.reference
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.sql b/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
similarity index 100%
rename from tests/queries/0_stateless/01669_columns_declaration_serde.sql
rename to tests/queries/0_stateless/01669_columns_declaration_serde_long.sql