diff --git a/tests/integration/test_adaptive_granularity/configs/wide_parts_only.xml b/tests/integration/test_adaptive_granularity/configs/wide_parts_only.xml
new file mode 100644
index 00000000000..42e2173f718
--- /dev/null
+++ b/tests/integration/test_adaptive_granularity/configs/wide_parts_only.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <merge_tree>
+        <min_rows_for_wide_part>0</min_rows_for_wide_part>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+    </merge_tree>
+</yandex>
diff --git a/tests/integration/test_adaptive_granularity/test.py b/tests/integration/test_adaptive_granularity/test.py
index 21d65588de4..7efafb4ddd1 100644
--- a/tests/integration/test_adaptive_granularity/test.py
+++ b/tests/integration/test_adaptive_granularity/test.py
@@ -13,10 +13,10 @@ node1 = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml'
 node2 = cluster.add_instance('node2', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml'], with_zookeeper=True)
 
 node3 = cluster.add_instance('node3', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml'], with_zookeeper=True, image='yandex/clickhouse-server', tag='19.6.3.18', with_installed_binary=True)
-node4 = cluster.add_instance('node4', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml'], with_zookeeper=True)
+node4 = cluster.add_instance('node4', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml', 'configs/wide_parts_only.xml'], with_zookeeper=True)
 
 node5 = cluster.add_instance('node5', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml'], with_zookeeper=True, image='yandex/clickhouse-server', tag='19.1.15', with_installed_binary=True)
-node6 = cluster.add_instance('node6', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml'], with_zookeeper=True)
+node6 = cluster.add_instance('node6', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml', 'configs/wide_parts_only.xml'], with_zookeeper=True)
 
 node7 = cluster.add_instance('node7', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml'], with_zookeeper=True, image='yandex/clickhouse-server', tag='19.6.3.18', stay_alive=True, with_installed_binary=True)
 node8 = cluster.add_instance('node8', main_configs=['configs/remote_servers.xml', 'configs/log_conf.xml'], with_zookeeper=True, image='yandex/clickhouse-server', tag='19.1.15', stay_alive=True, with_installed_binary=True)
@@ -270,8 +270,14 @@ def test_mixed_granularity_single_node(start_dynamic_cluster, node):
     node.query("INSERT INTO table_with_default_granularity VALUES (toDate('2018-09-01'), 1, 333), (toDate('2018-09-02'), 2, 444)")
 
     def callback(n):
-        n.replace_config("/etc/clickhouse-server/merge_tree_settings.xml", "<yandex><merge_tree><enable_mixed_granularity_parts>1</enable_mixed_granularity_parts></merge_tree></yandex>")
-        n.replace_config("/etc/clickhouse-server/config.d/merge_tree_settings.xml", "<yandex><merge_tree><enable_mixed_granularity_parts>1</enable_mixed_granularity_parts></merge_tree></yandex>")
+        new_config = """
+<yandex><merge_tree>
+    <enable_mixed_granularity_parts>1</enable_mixed_granularity_parts>
+    <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+</merge_tree></yandex>"""
+
+        n.replace_config("/etc/clickhouse-server/merge_tree_settings.xml", new_config)
+        n.replace_config("/etc/clickhouse-server/config.d/merge_tree_settings.xml", new_config)
 
     node.restart_with_latest_version(callback_onstop=callback)
     node.query("SYSTEM RELOAD CONFIG")
@@ -304,8 +310,14 @@ def test_version_update_two_nodes(start_dynamic_cluster):
     node12.query("SYSTEM SYNC REPLICA table_with_default_granularity", timeout=20)
     assert node12.query("SELECT COUNT() FROM table_with_default_granularity") == '2\n'
     def callback(n):
-        n.replace_config("/etc/clickhouse-server/merge_tree_settings.xml", "<yandex><merge_tree><enable_mixed_granularity_parts>0</enable_mixed_granularity_parts></merge_tree></yandex>")
-        n.replace_config("/etc/clickhouse-server/config.d/merge_tree_settings.xml", "<yandex><merge_tree><enable_mixed_granularity_parts>0</enable_mixed_granularity_parts></merge_tree></yandex>")
+        new_config = """
+<yandex><merge_tree>
+    <enable_mixed_granularity_parts>0</enable_mixed_granularity_parts>
+    <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+</merge_tree></yandex>"""
+
+        n.replace_config("/etc/clickhouse-server/merge_tree_settings.xml", new_config)
+        n.replace_config("/etc/clickhouse-server/config.d/merge_tree_settings.xml", new_config)
 
     node12.restart_with_latest_version(callback_onstop=callback)
 
diff --git a/tests/integration/test_polymorphic_parts/configs/compact_parts.xml b/tests/integration/test_polymorphic_parts/configs/compact_parts.xml
index e14c3f0ceae..5b3afe65d92 100644
--- a/tests/integration/test_polymorphic_parts/configs/compact_parts.xml
+++ b/tests/integration/test_polymorphic_parts/configs/compact_parts.xml
@@ -1,5 +1,6 @@
 <yandex>
     <merge_tree>
         <min_rows_for_wide_part>512</min_rows_for_wide_part>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
 </yandex>
diff --git a/tests/integration/test_polymorphic_parts/test.py b/tests/integration/test_polymorphic_parts/test.py
index ed89f768d4c..cf2268bc831 100644
--- a/tests/integration/test_polymorphic_parts/test.py
+++ b/tests/integration/test_polymorphic_parts/test.py
@@ -42,6 +42,7 @@ def create_tables(name, nodes, node_settings, shard):
         ORDER BY id
         SETTINGS index_granularity = 64, index_granularity_bytes = {index_granularity_bytes},
         min_rows_for_wide_part = {min_rows_for_wide_part}, min_rows_for_compact_part = {min_rows_for_compact_part},
+        min_bytes_for_wide_part = 0, min_bytes_for_compact_part = 0,
         in_memory_parts_enable_wal = 1
         '''.format(name=name, shard=shard, repl=i, **settings))
 
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.sql
index 56f3a654682..e6de5a91ce3 100644
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql
@@ -3,7 +3,7 @@ SELECT '===Ordinary case===';
 SET replication_alter_partitions_sync = 2;
 
 DROP TABLE IF EXISTS clear_column;
-CREATE TABLE clear_column (d Date, num Int64, str String) ENGINE = MergeTree(d, d, 8192);
+CREATE TABLE clear_column (d Date, num Int64, str String) ENGINE = MergeTree ORDER BY d PARTITION by d SETTINGS min_bytes_for_wide_part = 0;
 
 INSERT INTO clear_column VALUES ('2016-12-12', 1, 'a'), ('2016-11-12', 2, 'b');
 
@@ -24,8 +24,8 @@ SELECT '===Replicated case===';
 DROP TABLE IF EXISTS clear_column1;
 DROP TABLE IF EXISTS clear_column2;
 SELECT sleep(1) FORMAT Null;
-CREATE TABLE clear_column1 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column', '1', d, d, 8192);
-CREATE TABLE clear_column2 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column', '2', d, d, 8192);
+CREATE TABLE clear_column1 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column', '1') ORDER BY d PARTITION by d SETTINGS min_bytes_for_wide_part = 0;
+CREATE TABLE clear_column2 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column', '2') ORDER BY d PARTITION by d SETTINGS min_bytes_for_wide_part = 0;
 
 INSERT INTO clear_column1 (d) VALUES ('2000-01-01'), ('2000-02-01');
 SYSTEM SYNC REPLICA clear_column2;
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables.reference b/tests/queries/0_stateless/00753_system_columns_and_system_tables.reference
index 47c15da4b22..4d1fab83cc1 100644
--- a/tests/queries/0_stateless/00753_system_columns_and_system_tables.reference
+++ b/tests/queries/0_stateless/00753_system_columns_and_system_tables.reference
@@ -6,7 +6,7 @@
 │ name2 │                   1 │                 0 │                 0 │                  0 │
 │ name3 │                   0 │                 0 │                 0 │                  0 │
 └───────┴─────────────────────┴───────────────────┴───────────────────┴────────────────────┘
-147	1
+231	1
 ┌─name────────────────┬─partition_key─┬─sorting_key───┬─primary_key─┬─sampling_key─┐
 │ check_system_tables │ date          │ date, version │ date        │              │
 └─────────────────────┴───────────────┴───────────────┴─────────────┴──────────────┘
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables.sql b/tests/queries/0_stateless/00753_system_columns_and_system_tables.sql
index 1d7faa32952..9b9fa04e6b0 100644
--- a/tests/queries/0_stateless/00753_system_columns_and_system_tables.sql
+++ b/tests/queries/0_stateless/00753_system_columns_and_system_tables.sql
@@ -9,7 +9,8 @@ CREATE TABLE check_system_tables
   ) ENGINE = MergeTree()
     ORDER BY name1
     PARTITION BY name2
-    SAMPLE BY name1;
+    SAMPLE BY name1
+    SETTINGS min_bytes_for_wide_part = 0;
 
 SELECT name, partition_key, sorting_key, primary_key, sampling_key, storage_policy, total_rows
 FROM system.tables
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
index 74159738bce..d4c19cbe8f2 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
@@ -41,7 +41,7 @@ CREATE TABLE four_rows_per_granule (
   Sign Int8
 ) ENGINE CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(p) ORDER BY k
   SETTINGS index_granularity_bytes=110, min_index_granularity_bytes=100, write_final_mark = 0,
-  
+  min_bytes_for_wide_part = 0,
   enable_vertical_merge_algorithm=1,
   vertical_merge_algorithm_min_rows_to_activate=0,
   vertical_merge_algorithm_min_columns_to_activate=0;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
index f2e9e9749e3..249c6eebfcf 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
@@ -61,11 +61,7 @@ CREATE TABLE four_rows_per_granule (
   k UInt64,
   v1 UInt64,
   v2 Int64
-<<<<<<< HEAD
-) ENGINE MergeTree() PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0, min_bytes_for_wide_part = 0;
-=======
-) ENGINE MergeTree() PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 10, write_final_mark = 0;
->>>>>>> upstream/master
+) ENGINE MergeTree() PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 10, write_final_mark = 0, min_bytes_for_wide_part = 0;
 
 INSERT INTO four_rows_per_granule (p, k, v1, v2) VALUES ('2018-05-15', 1, 1000, 2000), ('2018-05-16', 2, 3000, 4000), ('2018-05-17', 3, 5000, 6000), ('2018-05-18', 4, 7000, 8000);
 
@@ -130,11 +126,7 @@ CREATE TABLE adaptive_granularity_alter (
   k UInt64,
   v1 UInt64,
   v2 Int64
-<<<<<<< HEAD
-) ENGINE MergeTree() PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0, min_bytes_for_wide_part = 0;
-=======
-) ENGINE MergeTree() PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0;
->>>>>>> upstream/master
+) ENGINE MergeTree() PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0, min_bytes_for_wide_part = 0;
 
 INSERT INTO adaptive_granularity_alter (p, k, v1, v2) VALUES ('2018-05-15', 1, 1000, 2000), ('2018-05-16', 2, 3000, 4000), ('2018-05-17', 3, 5000, 6000), ('2018-05-18', 4, 7000, 8000);
 
diff --git a/tests/queries/0_stateless/00933_ttl_simple.sql b/tests/queries/0_stateless/00933_ttl_simple.sql
index 83d9962043d..c0adcd21e62 100644
--- a/tests/queries/0_stateless/00933_ttl_simple.sql
+++ b/tests/queries/0_stateless/00933_ttl_simple.sql
@@ -23,7 +23,6 @@ create table ttl_00933_1 (d DateTime, a Int ttl d + interval 1 DAY) engine = Mer
 insert into ttl_00933_1 values (toDateTime('2000-10-10 00:00:00'), 1);
 insert into ttl_00933_1 values (toDateTime('2000-10-10 00:00:00'), 2);
 insert into ttl_00933_1 values (toDateTime('2000-10-10 00:00:00'), 3);
-optimize table ttl_00933_1 final;
 select * from ttl_00933_1 order by d;
 
 drop table if exists ttl_00933_1;
diff --git a/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference b/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference
index 3bcfc00eded..099fe566817 100644
--- a/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference
+++ b/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference
@@ -1 +1 @@
-20000101_20000101_1_1_0	test_00961	b78f351b7498ecc9d4732ad29c3952de	1d4b7fbf05d0fc5c2f4559ca75aa32f7	38f047b57fd1bb81cf77e273deb34218
+20000101_1_1_0	test_00961	5f2e2d4bbc14336f44037e3ac667f247	ed226557cd4e18ecf3ae06c6d5e6725c	da96ff1e527a8a1f908ddf2b1d0af239
diff --git a/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.sql b/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.sql
index 46daa0bf711..792bf62f9b1 100644
--- a/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.sql
+++ b/tests/queries/0_stateless/00961_checksums_in_system_parts_columns_table.sql
@@ -1,21 +1,15 @@
 DROP TABLE IF EXISTS test_00961;
 
-CREATE TABLE test_00961 (d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = MergeTree(d, (a, b), 111);
+CREATE TABLE test_00961 (d Date, a String, b UInt8, x String, y Int8, z UInt32)
+    ENGINE = MergeTree PARTITION BY d ORDER BY (a, b) SETTINGS index_granularity = 111, min_bytes_for_wide_part = 0;
 
 INSERT INTO test_00961 VALUES ('2000-01-01', 'Hello, world!', 123, 'xxx yyy', -123, 123456789);
 
 SELECT
-<<<<<<< HEAD
     name,
     table,
     hash_of_all_files,
     hash_of_uncompressed_files,
-=======
-    name, 
-    table, 
-    hash_of_all_files, 
-    hash_of_uncompressed_files, 
->>>>>>> upstream/master
     uncompressed_hash_of_compressed_files
 FROM system.parts
 WHERE table = 'test_00961' and database = currentDatabase();