diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 9599a1d1723..1609d8f3c07 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -555,8 +555,12 @@ class SettingsRandomizer:
         "prefer_localhost_replica": lambda: random.randint(0, 1),
         "max_block_size": lambda: random.randint(8000, 100000),
         "max_threads": lambda: random.randint(1, 64),
-        "optimize_or_like_chain": lambda: random.randint(0, 1),
+        "optimize_append_index": lambda: random.randint(0, 1),
+        "optimize_if_chain_to_multiif": lambda: random.randint(0, 1),
+        "optimize_if_transform_strings_to_enum": lambda: random.randint(0, 1),
         "optimize_read_in_order": lambda: random.randint(0, 1),
+        "optimize_or_like_chain": lambda: random.randint(0, 1),
+        "optimize_substitute_columns": lambda: random.randint(0, 1),
         "enable_multiple_prewhere_read_steps": lambda: random.randint(0, 1),
         "read_in_order_two_level_merge_threshold": lambda: random.randint(0, 100),
         "optimize_aggregation_in_order": lambda: random.randint(0, 1),
diff --git a/tests/queries/0_stateless/01300_group_by_other_keys_having.sql b/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
index 911f61a62e2..203e8322ad9 100644
--- a/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
+++ b/tests/queries/0_stateless/01300_group_by_other_keys_having.sql
@@ -1,4 +1,5 @@
 set optimize_group_by_function_keys = 1;
+set optimize_syntax_fuse_functions = 0;
 set allow_experimental_analyzer = 1;
 
 -- { echoOn }
diff --git a/tests/queries/0_stateless/01622_constraints_where_optimization.sql b/tests/queries/0_stateless/01622_constraints_where_optimization.sql
index 2818351a120..d41b1988bdd 100644
--- a/tests/queries/0_stateless/01622_constraints_where_optimization.sql
+++ b/tests/queries/0_stateless/01622_constraints_where_optimization.sql
@@ -1,5 +1,6 @@
 SET convert_query_to_cnf = 1;
 SET optimize_using_constraints = 1;
+SET optimize_append_index = 0;
 
 DROP TABLE IF EXISTS t_constraints_where;
 
diff --git a/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql b/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
index de9208ef009..fef71fdf94f 100644
--- a/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
+++ b/tests/queries/0_stateless/02481_analyzer_optimize_grouping_sets_keys.sql
@@ -1,4 +1,5 @@
 set allow_experimental_analyzer = 1;
+set optimize_syntax_fuse_functions = 0;
 
 EXPLAIN QUERY TREE run_passes=1
 SELECT avg(log(2) * number) AS k FROM numbers(10000000)
diff --git a/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql b/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql
index 91bdce2cca9..67623869f0a 100644
--- a/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql
+++ b/tests/queries/0_stateless/02498_analyzer_settings_push_down.sql
@@ -1,4 +1,5 @@
 SET allow_experimental_analyzer = 1;
+SET optimize_functions_to_subcolumns = 0;
 
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table (id UInt64, value Tuple(a UInt64)) ENGINE=MergeTree ORDER BY id;