diff --git a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
index 26d44d36a98..3f09e256b02 100755
--- a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
+++ b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
@@ -8,7 +8,7 @@ ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS test_optimize_exception"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS test_optimize_exception_replicated"
 
 ${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_optimize_exception (date Date) ENGINE=MergeTree() PARTITION BY toYYYYMM(date) ORDER BY date"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_optimize_exception_replicated (date Date) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/optimize', 'r1') PARTITION BY toYYYYMM(date) ORDER BY date"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_optimize_exception_replicated (date Date) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00029/optimize', 'r1') PARTITION BY toYYYYMM(date) ORDER BY date"
 
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO test_optimize_exception VALUES (toDate('2017-09-09')), (toDate('2017-09-10'))"
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO test_optimize_exception VALUES (toDate('2017-09-09')), (toDate('2017-09-10'))"
@@ -23,6 +23,5 @@ echo "$(${CLICKHOUSE_CLIENT} --optimize_throw_if_noop 1 --server_logs_file=/dev/
 echo "$(${CLICKHOUSE_CLIENT} --optimize_throw_if_noop 1 --server_logs_file=/dev/null --query="OPTIMIZE TABLE test_optimize_exception_replicated PARTITION 201710" 2>&1)" \
   | grep -c 'Code: 388. DB::Exception: .* DB::Exception:.* Cannot select parts for optimization'
 
-${CLICKHOUSE_CLIENT} --query="DROP TABLE test_optimize_exception NO DELAY"
-${CLICKHOUSE_CLIENT} --query="DROP TABLE test_optimize_exception_replicated NO DELAY"
-sleep 1
+${CLICKHOUSE_CLIENT} --query="DROP TABLE test_optimize_exception"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE test_optimize_exception_replicated"
diff --git a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference
index 128a9b477e5..69887db71c1 100644
--- a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference
+++ b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference
@@ -1,22 +1,22 @@
 d	Date					
 k	UInt64					
 i32	Int32					
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	10	42
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	9	41	1992-01-01 08:00:00
 2015-01-01	10	42	1970-01-01 00:00:00
 d	Date					
@@ -25,14 +25,14 @@ i32	Int32
 dt	DateTime(\'UTC\')					
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']
 2015-01-01	9	41	1992-01-01 08:00:00	[]	[]
 2015-01-01	10	42	1970-01-01 00:00:00	[]	[]
@@ -43,7 +43,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -51,7 +51,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	['2000-01-01','2000-01-01','2000-01-03']
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	['1970-01-01','1970-01-01','1970-01-01']
 2015-01-01	9	41	1992-01-01 08:00:00	[]	[]	[]
@@ -64,7 +64,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 n.d	Array(Date)					
 s	String	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -73,7 +73,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 n.d	Array(Date)					
 s	String	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	[10,20,30]	['asd','qwe','qwe']	['2000-01-01','2000-01-01','2000-01-03']	100500
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	['2000-01-01','2000-01-01','2000-01-03']	0
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	['1970-01-01','1970-01-01','1970-01-01']	0
@@ -86,7 +86,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 s	Int64	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -94,7 +94,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 s	Int64	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	[10,20,30]	['asd','qwe','qwe']	100500
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	0
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	0
@@ -108,7 +108,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
 n.d	Array(Date)					
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -117,7 +117,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
 n.d	Array(Date)					
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	[10,20,30]	['asd','qwe','qwe']	100500	['1970-01-01','1970-01-01','1970-01-01']
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	0	['1970-01-01','1970-01-01','1970-01-01']
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	0	['1970-01-01','1970-01-01','1970-01-01']
@@ -129,14 +129,14 @@ i32	Int32
 dt	DateTime(\'UTC\')					
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	['asd','qwe','qwe']	100500
 2015-01-01	7	39	2014-07-14 13:26:50	['120','130','140']	0
 2015-01-01	8	40	2012-12-12 12:12:12	['12','13','14']	0
@@ -147,13 +147,13 @@ k	UInt64
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	100500
 2015-01-01	7	39	2014-07-14 13:26:50	0
 2015-01-01	8	40	2012-12-12 12:12:12	0
@@ -166,7 +166,7 @@ dt	DateTime(\'UTC\')
 s	UInt32	DEFAULT	\'0\'			
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -174,7 +174,7 @@ dt	DateTime(\'UTC\')
 s	UInt32	DEFAULT	\'0\'			
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	100500	[]	[]
 2015-01-01	7	39	2014-07-14 13:26:50	0	[]	[]
 2015-01-01	8	40	2012-12-12 12:12:12	0	[]	[]
@@ -185,13 +185,13 @@ k	UInt64
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	100500
 2015-01-01	7	39	2014-07-14 13:26:50	0
 2015-01-01	8	40	2012-12-12 12:12:12	0
@@ -202,13 +202,13 @@ k	UInt64
 i32	Int32					
 dt	Date					
 s	DateTime(\'UTC\')	DEFAULT	\'1970-01-01 00:00:00\'			
-CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
+CREATE TABLE test.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	Date					
 s	DateTime(\'UTC\')	DEFAULT	\'1970-01-01 00:00:00\'			
-CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
+CREATE TABLE test.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15	1970-01-02 03:55:00
 2015-01-01	7	39	2014-07-14	1970-01-01 00:00:00
 2015-01-01	8	40	2012-12-12	1970-01-01 00:00:00
diff --git a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql
index 1bce062e766..2a933d21eeb 100644
--- a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql
+++ b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql
@@ -3,8 +3,8 @@ DROP TABLE IF EXISTS test.replicated_alter2;
 
 SET replication_alter_partitions_sync = 2;
 
-CREATE TABLE test.replicated_alter1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/alter', 'r1', d, k, 8192);
-CREATE TABLE test.replicated_alter2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/alter', 'r2', d, k, 8192);
+CREATE TABLE test.replicated_alter1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00062/alter', 'r1', d, k, 8192);
+CREATE TABLE test.replicated_alter2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00062/alter', 'r2', d, k, 8192);
 
 INSERT INTO test.replicated_alter1 VALUES ('2015-01-01', 10, 42);
 
diff --git a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper.sql b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper.sql
index 45f7ff4d93f..120d599bd35 100644
--- a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper.sql
+++ b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper.sql
@@ -54,30 +54,30 @@ CREATE TABLE aggregating_merge_tree_with_sampling
 	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = AggregatingMergeTree(d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
 
 CREATE TABLE replicated_merge_tree
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/01/replicated_merge_tree/', 'r1', d, (a, b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00083/01/replicated_merge_tree/', 'r1', d, (a, b), 111);
 CREATE TABLE replicated_collapsing_merge_tree
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test/01/replicated_collapsing_merge_tree/', 'r1', d, (a, b), 111, y);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test_00083/01/replicated_collapsing_merge_tree/', 'r1', d, (a, b), 111, y);
 CREATE TABLE replicated_versioned_collapsing_merge_tree
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/test/01/replicated_versioned_collapsing_merge_tree/', 'r1', d, (a, b), 111, y, b);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/test_00083/01/replicated_versioned_collapsing_merge_tree/', 'r1', d, (a, b), 111, y, b);
 CREATE TABLE replicated_summing_merge_tree
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test/01/replicated_summing_merge_tree/', 'r1', d, (a, b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test_00083/01/replicated_summing_merge_tree/', 'r1', d, (a, b), 111);
 CREATE TABLE replicated_summing_merge_tree_with_list_of_columns_to_sum
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test/01/replicated_summing_merge_tree_with_list_of_columns_to_sum/', 'r1', d, (a, b), 111, (y, z));
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test_00083/01/replicated_summing_merge_tree_with_list_of_columns_to_sum/', 'r1', d, (a, b), 111, (y, z));
 CREATE TABLE replicated_aggregating_merge_tree
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test/01/replicated_aggregating_merge_tree/', 'r1', d, (a, b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test_00083/01/replicated_aggregating_merge_tree/', 'r1', d, (a, b), 111);
 
 CREATE TABLE replicated_merge_tree_with_sampling
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/01/replicated_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00083/01/replicated_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
 CREATE TABLE replicated_collapsing_merge_tree_with_sampling
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test/01/replicated_collapsing_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111, y);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test_00083/01/replicated_collapsing_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111, y);
 CREATE TABLE replicated_versioned_collapsing_merge_tree_with_sampling
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/test/01/replicated_versioned_collapsing_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b, b), 111, y, b);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/test_00083/01/replicated_versioned_collapsing_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b, b), 111, y, b);
 CREATE TABLE replicated_summing_merge_tree_with_sampling
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test/01/replicated_summing_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test_00083/01/replicated_summing_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
 CREATE TABLE replicated_summing_merge_tree_with_sampling_with_list_of_columns_to_sum
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test/01/replicated_summing_merge_tree_with_sampling_with_list_of_columns_to_sum/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111, (y, z));
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedSummingMergeTree('/clickhouse/tables/test_00083/01/replicated_summing_merge_tree_with_sampling_with_list_of_columns_to_sum/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111, (y, z));
 CREATE TABLE replicated_aggregating_merge_tree_with_sampling
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test/01/replicated_aggregating_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test_00083/01/replicated_aggregating_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
 
 
 INSERT INTO merge_tree VALUES ('2000-01-01', 'Hello, world!', 123, 'xxx yyy', -123, 123456789);
diff --git a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
index 61c23db8d33..7ccf69e46b2 100644
--- a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
+++ b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
@@ -1,13 +1,12 @@
 DROP TABLE IF EXISTS alter_00121;
-CREATE TABLE alter_00121 (d Date, x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_00121', 'r1', d, (d), 8192);
+CREATE TABLE alter_00121 (d Date, x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_00121/t1', 'r1', d, (d), 8192);
 
 INSERT INTO alter_00121 VALUES ('2014-01-01', 1);
 ALTER TABLE alter_00121 DROP COLUMN x;
 
-DROP TABLE alter_00121 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE alter_00121;
 
-CREATE TABLE alter_00121 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_00121', 'r1', d, (d), 8192);
+CREATE TABLE alter_00121 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_00121/t2', 'r1', d, (d), 8192);
 
 INSERT INTO alter_00121 VALUES ('2014-01-01');
 SELECT * FROM alter_00121 ORDER BY d;
@@ -20,5 +19,4 @@ SELECT * FROM alter_00121 ORDER BY d;
 ALTER TABLE alter_00121 DROP COLUMN x;
 SELECT * FROM alter_00121 ORDER BY d;
 
-DROP TABLE alter_00121 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE alter_00121;
diff --git a/tests/queries/0_stateless/00215_primary_key_order_zookeeper.sql b/tests/queries/0_stateless/00215_primary_key_order_zookeeper.sql
index c6a0068f861..8e36cbc85e0 100644
--- a/tests/queries/0_stateless/00215_primary_key_order_zookeeper.sql
+++ b/tests/queries/0_stateless/00215_primary_key_order_zookeeper.sql
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS primary_key;
-CREATE TABLE primary_key (d Date DEFAULT today(), x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/primary_key', 'r1', d, -x, 1);
+CREATE TABLE primary_key (d Date DEFAULT today(), x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00215/primary_key', 'r1', d, -x, 1);
 
 INSERT INTO primary_key (x) VALUES (1), (2), (3);
 INSERT INTO primary_key (x) VALUES (1), (3), (2);
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.sql
index 6b29d0a8cd3..623218af167 100644
--- a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql
+++ b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS deduplication;
-CREATE TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/deduplication', 'r1', d, x, 1);
+CREATE TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00226/deduplication', 'r1', d, x, 1);
 
 INSERT INTO deduplication (x) VALUES (1);
 INSERT INTO deduplication (x) VALUES (1);
@@ -21,7 +21,7 @@ INSERT INTO deduplication (x) VALUES (1);
 SELECT * FROM deduplication;
 
 DETACH TABLE deduplication;
-ATTACH TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/deduplication', 'r1', d, x, 1);
+ATTACH TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00226/deduplication', 'r1', d, x, 1);
 
 SELECT * FROM deduplication;
 
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.sql
index 745d805d6ea..95a5c7c97f1 100644
--- 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.sql
@@ -3,8 +3,8 @@ SET replication_alter_partitions_sync = 2;
 DROP TABLE IF EXISTS attach_r1;
 DROP TABLE IF EXISTS attach_r2;
 
-CREATE TABLE attach_r1 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/01/attach', 'r1', d, d, 8192);
-CREATE TABLE attach_r2 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/01/attach', 'r2', d, d, 8192);
+CREATE TABLE attach_r1 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00236/01/attach', 'r1', d, d, 8192);
+CREATE TABLE attach_r2 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00236/01/attach', 'r2', d, d, 8192);
 
 INSERT INTO attach_r1 VALUES ('2014-01-01'), ('2014-02-01'), ('2014-03-01');
 
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
index bb71ddfd3b4..97830b828b6 100755
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
@@ -7,8 +7,8 @@ ch="$CLICKHOUSE_CLIENT --stacktrace -q"
 
 $ch "DROP TABLE IF EXISTS clear_column1"
 $ch "DROP TABLE IF EXISTS clear_column2"
-$ch "CREATE TABLE clear_column1 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test/tables/clear_column', '1', d, d, 8192)"
-$ch "CREATE TABLE clear_column2 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test/tables/clear_column', '2', d, d, 8192)"
+$ch "CREATE TABLE clear_column1 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column_concurrent', '1', d, d, 8192)"
+$ch "CREATE TABLE clear_column2 (d Date, i Int64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column_concurrent', '2', d, d, 8192)"
 
 $ch "ALTER TABLE clear_column1 CLEAR COLUMN VasyaUnexistingColumn IN PARTITION '200001'" --replication_alter_partitions_sync=2 1>/dev/null 2>/dev/null
 rc=$?
@@ -34,6 +34,5 @@ wait
 $ch "SELECT DISTINCT * FROM clear_column1 WHERE d != toDate('2000-03-01') ORDER BY d, i, s"
 $ch "SELECT DISTINCT * FROM clear_column2 WHERE d != toDate('2000-03-01') ORDER BY d, i, s"
 
-$ch "DROP TABLE clear_column1 NO DELAY"
-$ch "DROP TABLE clear_column2 NO DELAY"
-sleep 1
+$ch "DROP TABLE clear_column1"
+$ch "DROP TABLE clear_column2"
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 8f6fe5340c9..56f3a654682 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
@@ -21,11 +21,11 @@ DROP TABLE clear_column;
 
 SELECT '===Replicated case===';
 
-DROP TABLE IF EXISTS clear_column1 NO DELAY;
-DROP TABLE IF EXISTS clear_column2 NO DELAY;
+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/tables/clear_column', '1', d, d, 8192);
-CREATE TABLE clear_column2 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/test/tables/clear_column', '2', d, d, 8192);
+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);
 
 INSERT INTO clear_column1 (d) VALUES ('2000-01-01'), ('2000-02-01');
 SYSTEM SYNC REPLICA clear_column2;
diff --git a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
index eb916028f16..4a3dd2981cd 100644
--- a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
@@ -3,7 +3,7 @@ SELECT '*** Replicated with sampling ***';
 DROP TABLE IF EXISTS test.replicated_with_sampling;
 
 CREATE TABLE test.replicated_with_sampling(x UInt8)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test/replicated_with_sampling', 'r1')
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00509/replicated_with_sampling', 'r1')
     ORDER BY x
     SAMPLE BY x;
 
@@ -33,7 +33,7 @@ SELECT '*** Replicated Collapsing ***';
 DROP TABLE IF EXISTS test.replicated_collapsing;
 
 CREATE TABLE test.replicated_collapsing(d Date, x UInt32, sign Int8)
-    ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test/replicated_collapsing', 'r1', sign)
+    ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test_00509/replicated_collapsing', 'r1', sign)
     PARTITION BY toYYYYMM(d) ORDER BY d;
 
 INSERT INTO test.replicated_collapsing VALUES ('2017-10-23', 1, 1);
@@ -51,7 +51,7 @@ SELECT '*** Replicated VersionedCollapsing ***';
 DROP TABLE IF EXISTS test.replicated_versioned_collapsing;
 
 CREATE TABLE test.replicated_versioned_collapsing(d Date, x UInt32, sign Int8, version UInt8)
-    ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/test/replicated_versioned_collapsing', 'r1', sign, version)
+    ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/test_00509/replicated_versioned_collapsing', 'r1', sign, version)
     PARTITION BY toYYYYMM(d) ORDER BY (d, version);
 
 INSERT INTO test.replicated_versioned_collapsing VALUES ('2017-10-23', 1, 1, 0);
@@ -70,7 +70,7 @@ SELECT '*** Table definition with SETTINGS ***';
 DROP TABLE IF EXISTS test.with_settings;
 
 CREATE TABLE test.with_settings(x UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test/with_settings', 'r1')
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00509/with_settings', 'r1')
     ORDER BY x
     SETTINGS replicated_can_become_leader = 0;
 
diff --git a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
index b78c66e873d..48e1cd65c49 100644
--- a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
+++ b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
@@ -4,15 +4,15 @@ DROP TABLE IF EXISTS with_deduplication_mv;
 DROP TABLE IF EXISTS without_deduplication_mv;
 
 CREATE TABLE with_deduplication(x UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test/with_deduplication', 'r1') ORDER BY x;
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00510/with_deduplication', 'r1') ORDER BY x;
 CREATE TABLE without_deduplication(x UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test/without_deduplication', 'r1') ORDER BY x SETTINGS replicated_deduplication_window = 0;
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00510/without_deduplication', 'r1') ORDER BY x SETTINGS replicated_deduplication_window = 0;
 
 CREATE MATERIALIZED VIEW with_deduplication_mv
-    ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test/with_deduplication_mv', 'r1') ORDER BY dummy
+    ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test_00510/with_deduplication_mv', 'r1') ORDER BY dummy
     AS SELECT 0 AS dummy, countState(x) AS cnt FROM with_deduplication;
 CREATE MATERIALIZED VIEW without_deduplication_mv
-    ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test/without_deduplication_mv', 'r1') ORDER BY dummy
+    ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test_00510/without_deduplication_mv', 'r1') ORDER BY dummy
     AS SELECT 0 AS dummy, countState(x) AS cnt FROM without_deduplication;
 
 INSERT INTO with_deduplication VALUES (42);
diff --git a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
index 8590b661476..2a9ebb992a8 100644
--- a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS deduplication_by_partition;
 CREATE TABLE deduplication_by_partition(d Date, x UInt32) ENGINE =
-    ReplicatedMergeTree('/clickhouse/tables/test/deduplication_by_partition', 'r1', d, x, 8192);
+    ReplicatedMergeTree('/clickhouse/tables/test_00516/deduplication_by_partition', 'r1', d, x, 8192);
 
 INSERT INTO deduplication_by_partition VALUES ('2000-01-01', 1);
 INSERT INTO deduplication_by_partition VALUES ('2000-01-01', 2), ('2000-01-01', 3);
diff --git a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql
index b4579e6aac3..9c00ee68ba9 100644
--- a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql
+++ b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql
@@ -1,6 +1,6 @@
 -- Check that settings are correctly passed through Distributed table
 DROP TABLE IF EXISTS simple;
-CREATE TABLE simple (d Int8) ENGINE = ReplicatedMergeTree('/clickhouse/test/tables/test/simple', '1') ORDER BY d;
+CREATE TABLE simple (d Int8) ENGINE = ReplicatedMergeTree('/clickhouse/test_00563/tables/simple', '1') ORDER BY d;
 
 -- TODO: replace '127.0.0.2' -> '127.0.0.1' after a fix
 INSERT INTO TABLE FUNCTION remote('127.0.0.2', currentDatabase(), 'simple') VALUES (1);
diff --git a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql
index 30e43a8f38c..0f6d51b8716 100644
--- a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql
+++ b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql
@@ -1,8 +1,8 @@
 DROP TABLE IF EXISTS replicated_truncate1;
 DROP TABLE IF EXISTS replicated_truncate2;
 
-CREATE TABLE replicated_truncate1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/truncate', 'r1', d, k, 8192);
-CREATE TABLE replicated_truncate2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/truncate', 'r2', d, k, 8192);
+CREATE TABLE replicated_truncate1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00623/truncate', 'r1', d, k, 8192);
+CREATE TABLE replicated_truncate2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00623/truncate', 'r2', d, k, 8192);
 
 SELECT '======Before Truncate======';
 INSERT INTO replicated_truncate1 VALUES ('2015-01-01', 10, 42);
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
index cd6f4fb6ec5..8a900f9aeea 100755
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
@@ -31,8 +31,8 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst_r1;"
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst_r2;"
 
 $CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = MergeTree PARTITION BY p ORDER BY k;"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r1 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test/dst_1', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r2 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test/dst_1', '2') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r1 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00626/dst_1', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst_r2 (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00626/dst_1', '2') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '0', 1);"
diff --git a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
index 42b25585b81..a9be70be5b9 100755
--- a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
+++ b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
@@ -9,10 +9,10 @@ ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS a"
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS b"
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS c"
 
-${CLICKHOUSE_CLIENT} --query "CREATE TABLE root (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test/root', '1') ORDER BY d"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW a (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test/a', '1') ORDER BY d AS SELECT * FROM root"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW b (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test/b', '1') ORDER BY d SETTINGS parts_to_delay_insert=1, parts_to_throw_insert=1 AS SELECT * FROM root"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW c (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test/c', '1') ORDER BY d AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE root (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/root', '1') ORDER BY d"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW a (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/a', '1') ORDER BY d AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW b (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/b', '1') ORDER BY d SETTINGS parts_to_delay_insert=1, parts_to_throw_insert=1 AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW c (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/c', '1') ORDER BY d AS SELECT * FROM root"
 
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO root VALUES (1)";
 ${CLICKHOUSE_CLIENT} --query "SELECT _table, d FROM merge('${CLICKHOUSE_DATABASE}', '^[abc]\$') ORDER BY _table"
@@ -25,18 +25,16 @@ echo
 ${CLICKHOUSE_CLIENT} --query "SELECT _table, d FROM merge('${CLICKHOUSE_DATABASE}', '^[abc]\$') ORDER BY _table"
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE root"
-${CLICKHOUSE_CLIENT} --query "DROP TABLE a NO DELAY"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE a"
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE b"
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE c"
-sleep 2
 
 # Deduplication check for non-replicated root table
 echo
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE root (d UInt64) ENGINE = Null"
-${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW a (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test/a', '1') ORDER BY d AS SELECT * FROM root"
+${CLICKHOUSE_CLIENT} --query "CREATE MATERIALIZED VIEW d (d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00633/d', '1') ORDER BY d AS SELECT * FROM root"
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO root VALUES (1)";
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO root VALUES (1)";
-${CLICKHOUSE_CLIENT} --query "SELECT * FROM a";
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM d";
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE root"
-${CLICKHOUSE_CLIENT} --query "DROP TABLE a NO DELAY"
-sleep 1
+${CLICKHOUSE_CLIENT} --query "DROP TABLE d"
diff --git a/tests/queries/0_stateless/00643_cast_zookeeper.reference b/tests/queries/0_stateless/00643_cast_zookeeper.reference
index 226390d8510..eee4b660bda 100644
--- a/tests/queries/0_stateless/00643_cast_zookeeper.reference
+++ b/tests/queries/0_stateless/00643_cast_zookeeper.reference
@@ -3,7 +3,7 @@ CREATE TABLE test.cast1
     `x` UInt8,
     `e` Enum8('hello' = 1, 'world' = 2) DEFAULT CAST(x, 'Enum8(\'hello\' = 1, \'world\' = 2)')
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_cast', 'r1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00643/cast', 'r1')
 ORDER BY e
 SETTINGS index_granularity = 8192
 x	UInt8					
diff --git a/tests/queries/0_stateless/00643_cast_zookeeper.sql b/tests/queries/0_stateless/00643_cast_zookeeper.sql
index 8ebfee12da5..db439425eb8 100644
--- a/tests/queries/0_stateless/00643_cast_zookeeper.sql
+++ b/tests/queries/0_stateless/00643_cast_zookeeper.sql
@@ -20,7 +20,7 @@ CREATE TABLE test.cast1
             'world' = 2
         )
     )
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_cast', 'r1') ORDER BY e;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00643/cast', 'r1') ORDER BY e;
 
 SHOW CREATE TABLE test.cast1 FORMAT TSVRaw;
 DESC TABLE test.cast1;
@@ -28,7 +28,7 @@ DESC TABLE test.cast1;
 INSERT INTO test.cast1 (x) VALUES (1);
 SELECT * FROM test.cast1;
 
-CREATE TABLE test.cast2 AS test.cast1 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_cast', 'r2') ORDER BY e;
+CREATE TABLE test.cast2 AS test.cast1 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00643/cast', 'r2') ORDER BY e;
 
 SYSTEM SYNC REPLICA test.cast2;
 
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
index f37bd95436a..b8884df92ba 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
@@ -8,8 +8,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_r2"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r1(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/mutations', 'r1', d, intDiv(x, 10), 8192)"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r2(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/mutations', 'r2', d, intDiv(x, 10), 8192)"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r1(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations', 'r1', d, intDiv(x, 10), 8192)"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_r2(d Date, x UInt32, s String, m MATERIALIZED x + 2) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations', 'r2', d, intDiv(x, 10), 8192)"
 
 # Test a mutation on empty table
 ${CLICKHOUSE_CLIENT} --query="ALTER TABLE mutations_r1 DELETE WHERE x = 1"
@@ -50,11 +50,11 @@ ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_cleaner_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS mutations_cleaner_r2"
 
 # Create 2 replicas with finished_mutations_to_keep = 2
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/mutations_cleaner', 'r1') ORDER BY x SETTINGS \
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations_cleaner', 'r1') ORDER BY x SETTINGS \
     finished_mutations_to_keep = 2,
     cleanup_delay_period = 1,
     cleanup_delay_period_random_add = 0"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/mutations_cleaner', 'r2') ORDER BY x SETTINGS \
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00652/mutations_cleaner', 'r2') ORDER BY x SETTINGS \
     finished_mutations_to_keep = 2,
     cleanup_delay_period = 1,
     cleanup_delay_period_random_add = 0"
diff --git a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
index 95411671d19..8a8a9ed6615 100755
--- a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+++ b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
@@ -9,8 +9,8 @@ ${CLICKHOUSE_CLIENT} -n --query="
     DROP TABLE IF EXISTS fetches_r1;
     DROP TABLE IF EXISTS fetches_r2"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/fetches', 'r1') ORDER BY x"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/fetches', 'r2') ORDER BY x \
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00715/fetches', 'r1') ORDER BY x"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE fetches_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00715/fetches', 'r2') ORDER BY x \
     SETTINGS prefer_fetch_merged_part_time_threshold=0, \
              prefer_fetch_merged_part_size_threshold=0"
 
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.sql
index 956b1eb0249..498896d31a7 100644
--- 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.sql
@@ -1,8 +1,8 @@
 DROP TABLE IF EXISTS byte_identical_r1;
 DROP TABLE IF EXISTS byte_identical_r2;
 
-CREATE TABLE byte_identical_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/byte_identical', 'r1') ORDER BY x;
-CREATE TABLE byte_identical_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/byte_identical', 'r2') ORDER BY x;
+CREATE TABLE byte_identical_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00721/byte_identical', 'r1') ORDER BY x;
+CREATE TABLE byte_identical_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00721/byte_identical', 'r2') ORDER BY x;
 
 INSERT INTO byte_identical_r1(x) VALUES (1), (2), (3);
 SYSTEM SYNC REPLICA byte_identical_r2;
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.sql
index 6346dde9b76..3483e575fbb 100644
--- 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.sql
@@ -3,8 +3,8 @@ SET send_logs_level = 'fatal';
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_have_data', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_have_data', '2') ORDER BY x PARTITION BY y;
 
 INSERT INTO quorum1 VALUES (1, '1990-11-15');
 INSERT INTO quorum1 VALUES (2, '1990-11-15');
@@ -26,6 +26,5 @@ INSERT INTO quorum1 VALUES (6, '2020-12-16');
 SELECT x FROM quorum1 ORDER BY x;
 SELECT x FROM quorum2 ORDER BY x;
 
-DROP TABLE quorum1 NO DELAY;
-DROP TABLE quorum2 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE quorum1;
+DROP TABLE quorum2;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql
index bf9f63ee3c1..42d1c9060fe 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql
@@ -3,8 +3,8 @@ SET send_logs_level = 'fatal';
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost_alive', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost_alive', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2;
 SET select_sequential_consistency=1;
@@ -34,6 +34,5 @@ SYSTEM SYNC REPLICA quorum1;
 SELECT x FROM quorum1 ORDER BY x;
 SELECT x FROM quorum2 ORDER BY x;
 
-DROP TABLE quorum1 NO DELAY;
-DROP TABLE quorum2 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE quorum1;
+DROP TABLE quorum2;
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.sql
index 7d2ee796b48..9de73ac98e1 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql
@@ -3,8 +3,8 @@ SET send_logs_level = 'fatal';
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2;
 SET select_sequential_consistency=1;
@@ -31,6 +31,5 @@ SYSTEM SYNC REPLICA quorum1;
 SELECT x FROM quorum1 ORDER BY x;
 SELECT x FROM quorum2 ORDER BY x;
 
-DROP TABLE quorum1 NO DELAY;
-DROP TABLE quorum2 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE quorum1;
+DROP TABLE quorum2;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql
index 0f66598fc51..74f05d26b88 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql
@@ -3,8 +3,8 @@ SET send_logs_level = 'fatal';
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_old_data', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_old_data', '2') ORDER BY x PARTITION BY y;
 
 INSERT INTO quorum1 VALUES (1, '1990-11-15');
 INSERT INTO quorum1 VALUES (2, '1990-11-15');
@@ -24,6 +24,5 @@ INSERT INTO quorum2 VALUES (4, toDate('2020-12-16')); -- { serverError 319 }
 SELECT x FROM quorum1 ORDER BY x;
 SELECT x FROM quorum2 ORDER BY x;
 
-DROP TABLE quorum1 NO DELAY;
-DROP TABLE quorum2 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE quorum1;
+DROP TABLE quorum2;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql
index 397aa7853df..fe64b9bc150 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql
@@ -3,8 +3,8 @@ SET send_logs_level = 'fatal';
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum1', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum1', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2;
 SET select_sequential_consistency=1;
@@ -30,6 +30,5 @@ INSERT INTO quorum1 VALUES (4, '2018-11-15');
 SELECT sum(x) FROM quorum1;
 SELECT sum(x) FROM quorum2;
 
-DROP TABLE quorum1 NO DELAY;
-DROP TABLE quorum2 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE quorum1;
+DROP TABLE quorum2;
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.sql
index a77f3377202..07738ed0abd 100644
--- 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.sql
@@ -3,8 +3,8 @@ SET send_logs_level = 'fatal';
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/quorum', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum2', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum2', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2;
 SET select_sequential_consistency=1;
@@ -16,6 +16,5 @@ INSERT INTO quorum1 VALUES (3, '2018-12-16');
 SELECT x FROM quorum1 ORDER BY x;
 SELECT x FROM quorum2 ORDER BY x;
 
-DROP TABLE quorum1 NO DELAY;
-DROP TABLE quorum2 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE quorum1;
+DROP TABLE quorum2;
diff --git a/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference b/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference
index 5d8c5dc9f72..74aa60a41f2 100644
--- a/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference
+++ b/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference
@@ -1,6 +1,6 @@
-CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
+CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_00753/comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
 column_name1	UInt8	DEFAULT	1	comment		
 column_name2	UInt8			non default comment		
-CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'another comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
+CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'another comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_00753/comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
 column_name1	UInt8	DEFAULT	1	another comment		
 column_name2	UInt8			non default comment		
diff --git a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
index 84238a7e4d6..e98630bb00d 100644
--- a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
+++ b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
@@ -4,7 +4,7 @@ CREATE TABLE check_comments
   (
     column_name1 UInt8 DEFAULT 1 COMMENT 'comment',
     column_name2 UInt8 COMMENT 'non default comment'
-  ) ENGINE = ReplicatedMergeTree('clickhouse/tables/test_comments', 'r1')
+  ) ENGINE = ReplicatedMergeTree('clickhouse/tables/test_00753/comments', 'r1')
     ORDER BY column_name1;
 
 SHOW CREATE check_comments;
diff --git a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference
index 9303d45ea7d..4a7d4e3ff00 100644
--- a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference
+++ b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference
@@ -9,6 +9,6 @@
 1	2	1	30
 1	2	4	90
 *** Check SHOW CREATE TABLE ***
-CREATE TABLE test.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/test/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, -z)\nSETTINGS index_granularity = 8192
+CREATE TABLE test.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/test_00754/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, -z)\nSETTINGS index_granularity = 8192
 *** Check SHOW CREATE TABLE after offline ALTER ***
-CREATE TABLE test.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `t` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/test/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, t * t)\nSETTINGS index_granularity = 8192
+CREATE TABLE test.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `t` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/test_00754/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, t * t)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql
index e973259d4b7..0f861749537 100644
--- a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql
@@ -1,14 +1,14 @@
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS old_style;
-CREATE TABLE old_style(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/old_style', 'r1', d, x, 8192);
+CREATE TABLE old_style(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00754/old_style', 'r1', d, x, 8192);
 ALTER TABLE old_style ADD COLUMN y UInt32, MODIFY ORDER BY (x, y); -- { serverError 36 }
 DROP TABLE old_style;
 
 DROP TABLE IF EXISTS test.summing_r1;
 DROP TABLE IF EXISTS test.summing_r2;
-CREATE TABLE test.summing_r1(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/test/summing', 'r1') ORDER BY (x, y);
-CREATE TABLE test.summing_r2(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/test/summing', 'r2') ORDER BY (x, y);
+CREATE TABLE test.summing_r1(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/test_00754/summing', 'r1') ORDER BY (x, y);
+CREATE TABLE test.summing_r2(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/test_00754/summing', 'r2') ORDER BY (x, y);
 
 /* Can't add an expression with existing column to ORDER BY. */
 ALTER TABLE test.summing_r1 MODIFY ORDER BY (x, y, -val); -- { serverError 36 }
@@ -48,6 +48,5 @@ SYSTEM SYNC REPLICA test.summing_r2;
 SELECT '*** Check SHOW CREATE TABLE after offline ALTER ***';
 SHOW CREATE TABLE test.summing_r2;
 
-DROP TABLE test.summing_r1 NO DELAY;
-DROP TABLE test.summing_r2 NO DELAY;
-SELECT sleep(1) Format Null;
+DROP TABLE test.summing_r1;
+DROP TABLE test.summing_r2;
diff --git a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
index 9f0850ff7e5..0fd760d73d5 100644
--- a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
+++ b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
@@ -4,13 +4,13 @@ DROP TABLE IF EXISTS part_header_r2;
 SET replication_alter_partitions_sync = 2;
 
 CREATE TABLE part_header_r1(x UInt32, y UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test/part_header', '1') ORDER BY x
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00814/part_header', '1') ORDER BY x
     SETTINGS use_minimalistic_part_header_in_zookeeper = 0,
              old_parts_lifetime = 1,
              cleanup_delay_period = 0,
              cleanup_delay_period_random_add = 0;
 CREATE TABLE part_header_r2(x UInt32, y UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test/part_header', '2') ORDER BY x
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00814/part_header', '2') ORDER BY x
     SETTINGS use_minimalistic_part_header_in_zookeeper = 1,
              old_parts_lifetime = 1,
              cleanup_delay_period = 0,
@@ -39,10 +39,10 @@ SELECT sleep(3) FORMAT Null;
 SELECT '*** Test part removal ***';
 SELECT '*** replica 1 ***';
 SELECT name FROM system.parts WHERE active AND database = currentDatabase() AND table = 'part_header_r1';
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/test/part_header/replicas/1/parts';
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/test_00814/part_header/replicas/1/parts';
 SELECT '*** replica 2 ***';
 SELECT name FROM system.parts WHERE active AND database = currentDatabase() AND table = 'part_header_r2';
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/test/part_header/replicas/1/parts';
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/tables/test_00814/part_header/replicas/1/parts';
 
 SELECT '*** Test ALTER ***';
 ALTER TABLE part_header_r1 MODIFY COLUMN y String;
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index 51041876c64..089e76b0682 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -8,8 +8,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS test.kill_mutation_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS test.kill_mutation_r2"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE test.kill_mutation_r1(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/kill_mutation', '1') ORDER BY x PARTITION BY d"
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE test.kill_mutation_r2(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/kill_mutation', '2') ORDER BY x PARTITION BY d"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE test.kill_mutation_r1(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00834/kill_mutation', '1') ORDER BY x PARTITION BY d"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE test.kill_mutation_r2(d Date, x UInt32, s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00834/kill_mutation', '2') ORDER BY x PARTITION BY d"
 
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO test.kill_mutation_r1 VALUES ('2000-01-01', 1, 'a')"
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO test.kill_mutation_r1 VALUES ('2001-01-01', 2, 'b')"
diff --git a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference
index ce03d1e7de6..4029f0666b7 100644
--- a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference
+++ b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference
@@ -1,5 +1,5 @@
-CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	2
 1	2
@@ -14,8 +14,8 @@ CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDE
 3	2
 19	9
 65	75
-CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	4
 1	5
@@ -28,10 +28,10 @@ CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDE
 3	2
 19	9
 65	75
-CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	4
 1	5
@@ -44,14 +44,14 @@ CREATE TABLE test.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDE
 3	2
 19	9
 65	75
-CREATE TABLE test.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE test.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	3
 1	2
 1	3
-CREATE TABLE test.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE test.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE test.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	3
 1	2
diff --git a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql
index 2c13d2de166..5773357c675 100644
--- a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql
@@ -9,14 +9,14 @@ CREATE TABLE test.minmax_idx
 (
     u64 UInt64,
     i32 Int32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/indices_alter1', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter1', 'r1')
 ORDER BY u64;
 
 CREATE TABLE test.minmax_idx_r
 (
     u64 UInt64,
     i32 Int32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/indices_alter1', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter1', 'r2')
 ORDER BY u64;
 
 INSERT INTO test.minmax_idx VALUES (1, 2);
@@ -74,7 +74,7 @@ CREATE TABLE test.minmax_idx2
     i32 Int32,
     INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,
     INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/indices_alter2', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter2', 'r1')
 ORDER BY u64;
 
 CREATE TABLE test.minmax_idx2_r
@@ -83,7 +83,7 @@ CREATE TABLE test.minmax_idx2_r
     i32 Int32,
     INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,
     INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/indices_alter2', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter2', 'r2')
 ORDER BY u64;
 
 
diff --git a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql
index bd7f9d91694..2213ccecd4e 100644
--- a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql
@@ -15,7 +15,7 @@ CREATE TABLE minmax_idx1
       idx_all (i32, i32 + f64, d, s, e, dt) TYPE minmax GRANULARITY 1,
     INDEX
       idx_2 (u64 + toYear(dt), substring(s, 2, 4)) TYPE minmax GRANULARITY 3
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/minmax', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00837/minmax', 'r1')
 ORDER BY u64
 SETTINGS index_granularity = 2;
 
@@ -32,7 +32,7 @@ CREATE TABLE minmax_idx2
       idx_all (i32, i32 + f64, d, s, e, dt) TYPE minmax GRANULARITY 1,
     INDEX
       idx_2 (u64 + toYear(dt), substring(s, 2, 4)) TYPE minmax GRANULARITY 3
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/minmax', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00837/minmax', 'r2')
 ORDER BY u64
 SETTINGS index_granularity = 2;
 
@@ -70,4 +70,4 @@ SELECT * FROM minmax_idx1 WHERE (u64 < 2 OR u64 > 10) AND e != 'b' ORDER BY dt;
 SELECT * FROM minmax_idx2 WHERE (u64 < 2 OR u64 > 10) AND e != 'b' ORDER BY dt;
 
 DROP TABLE minmax_idx1;
-DROP TABLE minmax_idx2;
\ No newline at end of file
+DROP TABLE minmax_idx2;
diff --git a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference
index 62cea01089a..328022414b8 100644
--- a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference
+++ b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference
@@ -20,7 +20,7 @@
 274972506.6
 9175437371954010821
 9175437371954010821
-CREATE TABLE test.compression_codec_multiple_more_types_replicated\n(\n    `id` Decimal(38, 13) CODEC(ZSTD(1), LZ4, ZSTD(1), ZSTD(1), Delta(2), Delta(4), Delta(1), LZ4HC(0)),\n    `data` FixedString(12) CODEC(ZSTD(1), ZSTD(1), Delta(1), Delta(1), Delta(1), NONE, NONE, NONE, LZ4HC(0)),\n    `ddd.age` Array(UInt8) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8)),\n    `ddd.Name` Array(String) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8))\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/compression_codec_multiple_more_types_replicated\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE test.compression_codec_multiple_more_types_replicated\n(\n    `id` Decimal(38, 13) CODEC(ZSTD(1), LZ4, ZSTD(1), ZSTD(1), Delta(2), Delta(4), Delta(1), LZ4HC(0)),\n    `data` FixedString(12) CODEC(ZSTD(1), ZSTD(1), Delta(1), Delta(1), Delta(1), NONE, NONE, NONE, LZ4HC(0)),\n    `ddd.age` Array(UInt8) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8)),\n    `ddd.Name` Array(String) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8))\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00910/compression_codec_multiple_more_types_replicated\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 1.5555555555555	hello world!	[77]	['John']
 7.1000000000000	xxxxxxxxxxxx	[127]	['Henry']
 !
diff --git a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql
index 90d917ed3c5..e4c9f0ffc3b 100644
--- a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql
@@ -11,7 +11,7 @@ CREATE TABLE test.compression_codec_replicated1(
     somenum Float64 CODEC(ZSTD(2)),
     somestr FixedString(3) CODEC(LZ4HC(7)),
     othernum Int64 CODEC(Delta)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/compression_codec_replicated', '1') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_replicated', '1') ORDER BY tuple();
 
 CREATE TABLE test.compression_codec_replicated2(
   id UInt64 CODEC(LZ4),
@@ -20,7 +20,7 @@ CREATE TABLE test.compression_codec_replicated2(
   somenum Float64 CODEC(ZSTD(2)),
   somestr FixedString(3) CODEC(LZ4HC(7)),
   othernum Int64 CODEC(Delta)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/compression_codec_replicated', '2') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_replicated', '2') ORDER BY tuple();
 
 
 INSERT INTO test.compression_codec_replicated1 VALUES(1, 'hello', toDate('2018-12-14'), 1.1, 'aaa', 5);
@@ -57,14 +57,14 @@ CREATE TABLE test.compression_codec_multiple_replicated1 (
     data String CODEC(ZSTD(2), NONE, Delta(2), LZ4HC, LZ4, LZ4, Delta(8)),
     ddd Date CODEC(NONE, NONE, NONE, Delta(1), LZ4, ZSTD, LZ4HC, LZ4HC),
     somenum Float64 CODEC(Delta(4), LZ4, LZ4, ZSTD(2), LZ4HC(5), ZSTD(3), ZSTD)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/compression_codec_multiple', '1') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple', '1') ORDER BY tuple();
 
 CREATE TABLE test.compression_codec_multiple_replicated2 (
     id UInt64 CODEC(LZ4, ZSTD, NONE, LZ4HC, Delta(4)),
     data String CODEC(ZSTD(2), NONE, Delta(2), LZ4HC, LZ4, LZ4, Delta(8)),
     ddd Date CODEC(NONE, NONE, NONE, Delta(1), LZ4, ZSTD, LZ4HC, LZ4HC),
     somenum Float64 CODEC(Delta(4), LZ4, LZ4, ZSTD(2), LZ4HC(5), ZSTD(3), ZSTD)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/compression_codec_multiple', '2') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple', '2') ORDER BY tuple();
 
 
 INSERT INTO test.compression_codec_multiple_replicated2 VALUES (1, 'world', toDate('2018-10-05'), 1.1), (2, 'hello', toDate('2018-10-01'), 2.2), (3, 'buy', toDate('2018-10-11'), 3.3);
@@ -106,7 +106,7 @@ CREATE TABLE test.compression_codec_multiple_more_types_replicated (
     id Decimal128(13) CODEC(ZSTD, LZ4, ZSTD, ZSTD, Delta(2), Delta(4), Delta(1), LZ4HC),
     data FixedString(12) CODEC(ZSTD, ZSTD, Delta(1), Delta(1), Delta(1), NONE, NONE, NONE, LZ4HC),
     ddd Nested (age UInt8, Name String) CODEC(LZ4, LZ4HC, NONE, NONE, NONE, ZSTD, Delta(8))
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/compression_codec_multiple_more_types_replicated', '1') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple_more_types_replicated', '1') ORDER BY tuple();
 
 SHOW CREATE TABLE test.compression_codec_multiple_more_types_replicated;
 
@@ -124,7 +124,7 @@ CREATE TABLE test.compression_codec_multiple_with_key_replicated (
     somedate Date CODEC(ZSTD, ZSTD, ZSTD(12), LZ4HC(12), Delta, Delta),
     id UInt64 CODEC(LZ4, ZSTD, Delta, NONE, LZ4HC, Delta),
     data String CODEC(ZSTD(2), Delta(1), LZ4HC, NONE, LZ4, LZ4)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/compression_codec_multiple_with_key_replicated', '1') PARTITION BY somedate ORDER BY id SETTINGS index_granularity = 2;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple_with_key_replicated', '1') PARTITION BY somedate ORDER BY id SETTINGS index_granularity = 2;
 
 
 INSERT INTO test.compression_codec_multiple_with_key_replicated VALUES(toDate('2018-10-12'), 100000, 'hello'), (toDate('2018-10-12'), 100002, 'world'), (toDate('2018-10-12'), 1111, '!');
diff --git a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.sql b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.sql
index cd0512d6be8..0108bb68743 100644
--- a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.sql
@@ -7,12 +7,12 @@ DROP TABLE IF EXISTS alter_compression_codec2;
 CREATE TABLE alter_compression_codec1 (
     somedate Date CODEC(LZ4),
     id UInt64 CODEC(NONE)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_compression_codecs', '1') PARTITION BY somedate ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/alter_compression_codecs', '1') PARTITION BY somedate ORDER BY id;
 
 CREATE TABLE alter_compression_codec2 (
   somedate Date CODEC(LZ4),
   id UInt64 CODEC(NONE)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_compression_codecs', '2') PARTITION BY somedate ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/alter_compression_codecs', '2') PARTITION BY somedate ORDER BY id;
 
 INSERT INTO alter_compression_codec1 VALUES('2018-01-01', 1);
 INSERT INTO alter_compression_codec1 VALUES('2018-01-01', 2);
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.sql
index 54726fa837a..e227222a939 100644
--- 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.sql
@@ -1,10 +1,9 @@
 DROP TABLE IF EXISTS replicated_optimize1;
 DROP TABLE IF EXISTS replicated_optimize2;
-CREATE TABLE replicated_optimize1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/optimize', 'r1', d, k, 8192);
-CREATE TABLE replicated_optimize2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/optimize', 'r2', d, k, 8192);
+CREATE TABLE replicated_optimize1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00925/optimize', 'r1', d, k, 8192);
+CREATE TABLE replicated_optimize2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00925/optimize', 'r2', d, k, 8192);
 
 OPTIMIZE TABLE replicated_optimize1 FINAL;
 
-DROP TABLE replicated_optimize1 NO DELAY;
-DROP TABLE replicated_optimize2 NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE replicated_optimize1;
+DROP TABLE replicated_optimize2;
diff --git a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql
index a7ae0402b5a..2870edebdc2 100644
--- a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql
@@ -8,14 +8,14 @@ CREATE TABLE zero_rows_per_granule1 (
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/zero_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/zero_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, write_final_mark = 0;
 
 CREATE TABLE zero_rows_per_granule2 (
   p Date,
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/zero_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/zero_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, write_final_mark = 0;
 
 INSERT INTO zero_rows_per_granule1 (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);
 
@@ -68,14 +68,14 @@ CREATE TABLE four_rows_per_granule1 (
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/four_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/four_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
 
 CREATE TABLE four_rows_per_granule2 (
   p Date,
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/four_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/four_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
 
 INSERT INTO four_rows_per_granule1 (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);
 
@@ -135,14 +135,14 @@ CREATE TABLE adaptive_granularity_alter1 (
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/adaptive_granularity_alter', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/adaptive_granularity_alter', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
 
 CREATE TABLE adaptive_granularity_alter2 (
   p Date,
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/adaptive_granularity_alter', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/adaptive_granularity_alter', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, write_final_mark = 0;
 
 INSERT INTO adaptive_granularity_alter1 (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_replicated_zookeeper.reference b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference
index c727c24707d..16818d9c7dc 100644
--- a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference
+++ b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference
@@ -1,3 +1,3 @@
 200
 400
-CREATE TABLE test.ttl_repl2\n(\n    `d` Date,\n    `x` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/ttl_repl\', \'2\')\nPARTITION BY toDayOfMonth(d)\nORDER BY x\nTTL d + toIntervalDay(1)\nSETTINGS index_granularity = 8192
+CREATE TABLE test.ttl_repl2\n(\n    `d` Date,\n    `x` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00933/ttl_repl\', \'2\')\nPARTITION BY toDayOfMonth(d)\nORDER BY x\nTTL d + toIntervalDay(1)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql
index a80817eda95..ac45f2903d5 100644
--- a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql
@@ -1,9 +1,9 @@
 DROP TABLE IF EXISTS test.ttl_repl1;
 DROP TABLE IF EXISTS test.ttl_repl2;
 
-CREATE TABLE test.ttl_repl1(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/ttl_repl', '1')
+CREATE TABLE test.ttl_repl1(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00933/ttl_repl', '1')
     PARTITION BY toDayOfMonth(d) ORDER BY x TTL d + INTERVAL 1 DAY;
-CREATE TABLE test.ttl_repl2(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/ttl_repl', '2')
+CREATE TABLE test.ttl_repl2(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00933/ttl_repl', '2')
     PARTITION BY toDayOfMonth(d) ORDER BY x TTL d + INTERVAL 1 DAY;
 
 INSERT INTO TABLE test.ttl_repl1 VALUES (toDate('2000-10-10 00:00:00'), 100);
diff --git a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
index a0e6a3a3a03..10023ec7d0d 100755
--- a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
+++ b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
@@ -14,7 +14,7 @@ CREATE TABLE elog (
     engine_id UInt32,
     referrer String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/elog', 'test')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00953/elog', 'test')
 PARTITION BY date
 ORDER BY (engine_id)
 SETTINGS replicated_deduplication_window = 2, cleanup_delay_period=4, cleanup_delay_period_random_add=0;"
@@ -27,35 +27,35 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 3, 'h
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 3 rows
 
-count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/elog/blocks'")
+count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
 
 while [[ $count != 2 ]]
 do
     sleep 1
-    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/elog/blocks'")
+    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
 done
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 1, 'hello')"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 4 rows
-count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/elog/blocks'")
+count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
 
 while [[ $count != 2 ]]
 do
     sleep 1
-    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/elog/blocks'")
+    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
 done
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'hello')"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 5 rows
 
-count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/elog/blocks'")
+count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
 
 while [[ $count != 2 ]]
 do
     sleep 1
-    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/elog/blocks'")
+    count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/test_00953/elog/blocks'")
 done
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'hello')"
diff --git a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh
index cffa3077daa..6e476042731 100755
--- a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh
@@ -15,7 +15,7 @@ CREATE TABLE indices_mutaions1
     i64 Int64,
     i32 Int32,
     INDEX idx (i64, u64 * i64) TYPE minmax GRANULARITY 1
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/indices_mutaions', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00975/indices_mutaions', 'r1')
 PARTITION BY i32
 ORDER BY u64
 SETTINGS index_granularity = 2;
@@ -25,7 +25,7 @@ CREATE TABLE indices_mutaions2
     i64 Int64,
     i32 Int32,
     INDEX idx (i64, u64 * i64) TYPE minmax GRANULARITY 1
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/indices_mutaions', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00975/indices_mutaions', 'r2')
 PARTITION BY i32
 ORDER BY u64
 SETTINGS index_granularity = 2;"
diff --git a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.reference b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.reference
index 2682051751b..ee5a8024a92 100644
--- a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.reference
+++ b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.reference
@@ -1,12 +1,12 @@
-CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192
-CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192
+CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00980/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192
+CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00980/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192
 4
 4
 4
 4
 6
 6
-CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192, use_minimalistic_part_header_in_zookeeper = 1
-CREATE TABLE default.replicated_table_for_alter2\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/replicated_table_for_alter\', \'2\')\nORDER BY id\nSETTINGS index_granularity = 8192, parts_to_throw_insert = 1, parts_to_delay_insert = 1
-CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String,\n    `Data2` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192, use_minimalistic_part_header_in_zookeeper = 1, check_delay_period = 15
-CREATE TABLE default.replicated_table_for_alter2\n(\n    `id` UInt64,\n    `Data` String,\n    `Data2` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/replicated_table_for_alter\', \'2\')\nORDER BY id\nSETTINGS index_granularity = 8192, parts_to_throw_insert = 1, parts_to_delay_insert = 1
+CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00980/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192, use_minimalistic_part_header_in_zookeeper = 1
+CREATE TABLE default.replicated_table_for_alter2\n(\n    `id` UInt64,\n    `Data` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00980/replicated_table_for_alter\', \'2\')\nORDER BY id\nSETTINGS index_granularity = 8192, parts_to_throw_insert = 1, parts_to_delay_insert = 1
+CREATE TABLE default.replicated_table_for_alter1\n(\n    `id` UInt64,\n    `Data` String,\n    `Data2` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00980/replicated_table_for_alter\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192, use_minimalistic_part_header_in_zookeeper = 1, check_delay_period = 15
+CREATE TABLE default.replicated_table_for_alter2\n(\n    `id` UInt64,\n    `Data` String,\n    `Data2` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00980/replicated_table_for_alter\', \'2\')\nORDER BY id\nSETTINGS index_granularity = 8192, parts_to_throw_insert = 1, parts_to_delay_insert = 1
diff --git a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
index 08c9bbd8004..60e4cfff4e1 100644
--- a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
@@ -6,12 +6,12 @@ SET replication_alter_partitions_sync = 2;
 CREATE TABLE replicated_table_for_alter1 (
   id UInt64,
   Data String
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/replicated_table_for_alter', '1') ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00980/replicated_table_for_alter', '1') ORDER BY id;
 
 CREATE TABLE replicated_table_for_alter2 (
   id UInt64,
   Data String
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/replicated_table_for_alter', '2') ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00980/replicated_table_for_alter', '2') ORDER BY id;
 
 SHOW CREATE TABLE replicated_table_for_alter1;
 
diff --git a/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql b/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql
index 57ec4460e79..f8895843dd3 100644
--- a/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql
+++ b/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql
@@ -6,14 +6,14 @@ CREATE TABLE replicated_constraints1
     a UInt32,
     b UInt32,
     CONSTRAINT a_constraint CHECK a < 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_constraints', 'r1') ORDER BY (a);
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00988/alter_constraints', 'r1') ORDER BY (a);
 
 CREATE TABLE replicated_constraints2
 (
     a UInt32,
     b UInt32,
     CONSTRAINT a_constraint CHECK a < 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_constraints', 'r2') ORDER BY (a);
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00988/alter_constraints', 'r2') ORDER BY (a);
 
 INSERT INTO replicated_constraints1 VALUES (1, 2);
 INSERT INTO replicated_constraints2 VALUES (3, 4);
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index b6724e1036e..d86631513a1 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -51,7 +51,7 @@ function thread6()
     while true; do
         REPLICA=$(($RANDOM % 10))
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS alter_table_$REPLICA;
-            CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
+            CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00993/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
         sleep 0.$RANDOM;
         done
 }
diff --git a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
index 80af6d33613..8d190291457 100755
--- a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
@@ -22,12 +22,11 @@ function query_with_retry
     echo "Query '$1' failed with '$result'"
 }
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS src NO DELAY;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst NO DELAY;"
-sleep 1
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS src;"
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS dst;"
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src', '1') PARTITION BY p ORDER BY k;"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src1', '1') PARTITION BY p ORDER BY k;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst1', '1') PARTITION BY p ORDER BY k SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '0', 1);"
@@ -51,14 +50,13 @@ $CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM src;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM dst;"
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE src NO DELAY;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst NO DELAY;"
-sleep 1
+$CLICKHOUSE_CLIENT --query="DROP TABLE src;"
+$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'MOVE incompatible schema missing column';"
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src', '1') PARTITION BY p ORDER BY (d, p);"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst', '1') PARTITION BY p ORDER BY (d, p) SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src2', '1') PARTITION BY p ORDER BY (d, p);"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst2', '1') PARTITION BY p ORDER BY (d, p) SETTINGS old_parts_lifetime=1, cleanup_delay_period=1, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (1, '0', 1);"
@@ -71,14 +69,13 @@ $CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM src;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM dst;"
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE src NO DELAY;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst NO DELAY;"
-sleep 1
+$CLICKHOUSE_CLIENT --query="DROP TABLE src;"
+$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
 
 $CLICKHOUSE_CLIENT --query="SELECT 'MOVE incompatible schema different order by';"
 
-$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src', '1') PARTITION BY p ORDER BY (p, k, d);"
-$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst', '1') PARTITION BY p ORDER BY (d, k, p);"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE src (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/src3', '1') PARTITION BY p ORDER BY (p, k, d);"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE dst (p UInt64, k String, d UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_DATABASE/dst3', '1') PARTITION BY p ORDER BY (d, k, p);"
 
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO src VALUES (0, '0', 1);"
@@ -92,7 +89,6 @@ $CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA dst;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM src;"
 $CLICKHOUSE_CLIENT --query="SELECT count(), sum(d) FROM dst;"
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE src NO DELAY;"
-$CLICKHOUSE_CLIENT --query="DROP TABLE dst NO DELAY;"
-sleep 1
+$CLICKHOUSE_CLIENT --query="DROP TABLE src;"
+$CLICKHOUSE_CLIENT --query="DROP TABLE dst;"
 
diff --git a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
index d8f5356d145..60c6d55c4f5 100644
--- a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
+++ b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
@@ -13,7 +13,7 @@ DROP TABLE IF EXISTS mt_without_pk;
 
 DROP TABLE IF EXISTS replicated_mt_without_pk;
 
-CREATE TABLE replicated_mt_without_pk (SomeField1 Int64, SomeField2 Double) ENGINE = ReplicatedMergeTree('/clickhouse/tables/replicated_mt_without_pk', '1') ORDER BY tuple();
+CREATE TABLE replicated_mt_without_pk (SomeField1 Int64, SomeField2 Double) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01037/replicated_mt_without_pk', '1') ORDER BY tuple();
 
 INSERT INTO replicated_mt_without_pk VALUES (1, 2);
 
diff --git a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
index dabf708426a..97a783cb07d 100755
--- a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
+++ b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
@@ -45,7 +45,7 @@ ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS table_for_mutations"
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS replicated_table_for_mutations"
 
-${CLICKHOUSE_CLIENT} --query="CREATE TABLE replicated_table_for_mutations(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/replicated_table_for_mutations', '1') ORDER BY k PARTITION BY modulo(k, 2)"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE replicated_table_for_mutations(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01045/replicated_table_for_mutations', '1') ORDER BY k PARTITION BY modulo(k, 2)"
 
 ${CLICKHOUSE_CLIENT} --query="SYSTEM STOP MERGES"
 
diff --git a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql
index 269b568b5f6..c84fb22043f 100644
--- a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql
+++ b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql
@@ -3,9 +3,9 @@ DROP TABLE IF EXISTS table_for_synchronous_mutations2;
 
 SELECT 'Replicated';
 
-CREATE TABLE table_for_synchronous_mutations1(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/table_for_synchronous_mutations', '1') ORDER BY k;
+CREATE TABLE table_for_synchronous_mutations1(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01049/table_for_synchronous_mutations', '1') ORDER BY k;
 
-CREATE TABLE table_for_synchronous_mutations2(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/table_for_synchronous_mutations', '2') ORDER BY k;
+CREATE TABLE table_for_synchronous_mutations2(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01049/table_for_synchronous_mutations', '2') ORDER BY k;
 
 INSERT INTO table_for_synchronous_mutations1 select number, number from numbers(100000);
 
diff --git a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql
index 3d4f1e6e044..b830c549dc3 100644
--- a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql
+++ b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql
@@ -6,7 +6,7 @@ CREATE TABLE test_alter_on_mutation
   key UInt64,
   value String
 )
-ENGINE ReplicatedMergeTree('/clickhouse/tables/test_alter_on_mutation', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01062/alter_on_mutation', '1')
 ORDER BY key PARTITION BY date;
 
 INSERT INTO test_alter_on_mutation select toDate('2020-01-05'), number, toString(number) from system.numbers limit 100;
@@ -58,7 +58,7 @@ DROP TABLE IF EXISTS test_alter_on_mutation;
 
 DROP TABLE IF EXISTS nested_alter;
 
-CREATE TABLE nested_alter (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date), `s` String DEFAULT '0') ENGINE = ReplicatedMergeTree('/clickhouse/tables/nested_alter', 'r2', d, k, 8192);
+CREATE TABLE nested_alter (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date), `s` String DEFAULT '0') ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01062/nested_alter', 'r2', d, k, 8192);
 
 INSERT INTO nested_alter VALUES ('2015-01-01', 6,38,'2014-07-15 13:26:50',[10,20,30],['asd','qwe','qwe'],['2000-01-01','2000-01-01','2000-01-03'],'100500');
 
diff --git a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
index 398c02d2048..4f86d7c1666 100755
--- a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
@@ -19,7 +19,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_mutate_mt_$i (key UInt64, value1 UInt64, value2 String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/concurrent_mutate_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_mutate_mt_$i (key UInt64, value1 UInt64, value2 String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01076/concurrent_mutate_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_mutate_mt_1 SELECT number, number + 10, toString(number) from numbers(10)"
diff --git a/tests/queries/0_stateless/01079_alter_default_zookeeper.reference b/tests/queries/0_stateless/01079_alter_default_zookeeper.reference
index 758150a7799..7dd539b2683 100644
--- a/tests/queries/0_stateless/01079_alter_default_zookeeper.reference
+++ b/tests/queries/0_stateless/01079_alter_default_zookeeper.reference
@@ -1,11 +1,11 @@
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` String DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` String DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 1000
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 1000
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt16 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt16 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 10000
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\',\n    `other_date` String DEFAULT 1\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\',\n    `other_date` String DEFAULT 1\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01079_alter_default_zookeeper.sql b/tests/queries/0_stateless/01079_alter_default_zookeeper.sql
index 8779851e308..6fa9d2bf4e0 100644
--- a/tests/queries/0_stateless/01079_alter_default_zookeeper.sql
+++ b/tests/queries/0_stateless/01079_alter_default_zookeeper.sql
@@ -5,7 +5,7 @@ CREATE TABLE alter_default
   date Date,
   key UInt64
 )
-ENGINE ReplicatedMergeTree('/clickhouse/tables/alter_default', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01079/alter_default', '1')
 ORDER BY key;
 
 INSERT INTO alter_default select toDate('2020-01-05'), number from system.numbers limit 100;
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper.reference b/tests/queries/0_stateless/01079_bad_alters_zookeeper.reference
index deb26676f39..ebefe4b2a29 100644
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper.reference
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper.reference
@@ -1,6 +1,6 @@
 Wrong column name.
-CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_bad_alters\n(\n    `key` UInt64,\n    `value1` UInt8,\n    `value2` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/table_for_bad_alters\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 syntax error at begin of string.
 7
 Hello
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper.sh b/tests/queries/0_stateless/01079_bad_alters_zookeeper.sh
index 41ee563f146..98aa6d6e6e2 100755
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper.sh
@@ -9,7 +9,7 @@ $CLICKHOUSE_CLIENT -n --query "CREATE TABLE table_for_bad_alters (
     key UInt64,
     value1 UInt8,
     value2 String
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/table_for_bad_alters', '1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/table_for_bad_alters', '1')
 ORDER BY key;"
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO table_for_bad_alters VALUES(1, 1, 'Hello');"
diff --git a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
index f351b3be8ff..d6025652343 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
@@ -11,7 +11,7 @@ done
 
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_add_drop_$i (key UInt64, value0 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/concurrent_alter_add_drop_column', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_add_drop_$i (key UInt64, value0 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/concurrent_alter_add_drop_column', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_add_drop_1 SELECT number, number + 10 from numbers(100000)"
diff --git a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
index 355e987a6de..365bc2ae444 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
@@ -10,7 +10,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_detach_$i (key UInt64, value1 UInt8, value2 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/concurrent_alter_detach', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_detach_$i (key UInt64, value1 UInt8, value2 UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/concurrent_alter_detach', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000,temporary_directories_lifetime=10,cleanup_delay_period=3,cleanup_delay_period_random_add=0"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_detach_1 SELECT number, number + 10, number from numbers(10)"
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh
index 859425241eb..777c694e5bd 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper.sh
@@ -10,7 +10,7 @@ for i in $(seq $REPLICAS); do
 done
 
 for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_mt_$i (key UInt64, value1 UInt64, value2 Int32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/concurrent_alter_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE concurrent_alter_mt_$i (key UInt64, value1 UInt64, value2 Int32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01079/concurrent_alter_mt', '$i') ORDER BY key SETTINGS max_replicated_mutations_in_queue=1000, number_of_free_entries_in_pool_to_execute_mutation=0,max_replicated_merges_in_queue=1000"
 done
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO concurrent_alter_mt_1 SELECT number, number + 10, number from numbers(10)"
diff --git a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql
index eb117ddf530..8c4ba1fd318 100644
--- a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql
+++ b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql
@@ -1,8 +1,8 @@
 DROP TABLE IF EXISTS mutations_and_quorum1;
 DROP TABLE IF EXISTS mutations_and_quorum2;
 
-CREATE TABLE mutations_and_quorum1 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/default/1/mutations_and_quorum', '1') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
-CREATE TABLE mutations_and_quorum2 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/default/1/mutations_and_quorum', '2') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
+CREATE TABLE mutations_and_quorum1 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01090/mutations_and_quorum', '1') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
+CREATE TABLE mutations_and_quorum2 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01090/mutations_and_quorum', '2') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
 
 SET insert_quorum=2;
 
diff --git a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
index d6eb29a7ffa..c48665b6093 100755
--- a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
+++ b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
@@ -25,7 +25,7 @@ function thread3()
 {
     while true; do
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS concurrent_optimize_table;
-            CREATE TABLE concurrent_optimize_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/concurrent_optimize_table', '1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
+            CREATE TABLE concurrent_optimize_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01103/concurrent_optimize_table', '1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
         sleep 0.$RANDOM;
         sleep 0.$RANDOM;
         sleep 0.$RANDOM;
diff --git a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock.reference b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.reference
similarity index 100%
rename from tests/queries/0_stateless/01108_restart_replicas_rename_deadlock.reference
rename to tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.reference
diff --git a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock.sh b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
similarity index 95%
rename from tests/queries/0_stateless/01108_restart_replicas_rename_deadlock.sh
rename to tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
index 07b19b01bbb..bc7588f07f8 100755
--- a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock.sh
+++ b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 for i in $(seq 4); do
     $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_$i"
     $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_${i}_tmp"
-    $CLICKHOUSE_CLIENT -q "CREATE TABLE replica_01108_$i (n int) ENGINE=ReplicatedMergeTree('/clickhouse/tables/replica_01108_$i', 'replica') ORDER BY tuple()"
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE replica_01108_$i (n int) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01108/replica_01108_$i', 'replica') ORDER BY tuple()"
     $CLICKHOUSE_CLIENT -q "INSERT INTO replica_01108_$i SELECT * FROM system.numbers LIMIT $i * 10, 10"
 done
 
@@ -76,7 +76,6 @@ $CLICKHOUSE_CLIENT -q "SELECT sum(n), count(n) FROM merge(currentDatabase(), '^r
 
 
 for i in $(seq 4); do
-    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_$i NO DELAY"
-    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_${i}_tmp NO DELAY"
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_$i"
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS replica_01108_${i}_tmp"
 done
-sleep 2
diff --git a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference
index 6a5dd7223bd..cf69f1c5896 100644
--- a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference
+++ b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference
@@ -1,2 +1,2 @@
 4
-CREATE TABLE default.default_table\n(\n    `id` UInt64,\n    `enum_column` Enum8(\'undefined\' = 0, \'fox\' = 1, \'index\' = 2) DEFAULT \'fox\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/default_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.default_table\n(\n    `id` UInt64,\n    `enum_column` Enum8(\'undefined\' = 0, \'fox\' = 1, \'index\' = 2) DEFAULT \'fox\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01135/default_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
index 71d418ff48b..982c72eb333 100644
--- a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
+++ b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
@@ -5,7 +5,7 @@ CREATE TABLE default_table
   id UInt64,
   enum_column Enum8('undefined' = 0, 'fox' = 1, 'index' = 2)
 )
-ENGINE ReplicatedMergeTree('/clickhouse/test/default_table', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/test_01135/default_table', '1')
 ORDER BY tuple();
 
 INSERT INTO default_table VALUES(1, 'index'), (2, 'fox');
diff --git a/tests/queries/0_stateless/01192_rename_database.reference b/tests/queries/0_stateless/01192_rename_database_zookeeper.reference
similarity index 100%
rename from tests/queries/0_stateless/01192_rename_database.reference
rename to tests/queries/0_stateless/01192_rename_database_zookeeper.reference
diff --git a/tests/queries/0_stateless/01192_rename_database.sh b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
similarity index 100%
rename from tests/queries/0_stateless/01192_rename_database.sh
rename to tests/queries/0_stateless/01192_rename_database_zookeeper.sh
diff --git a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated.reference b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.reference
similarity index 100%
rename from tests/queries/0_stateless/01201_drop_column_compact_part_replicated.reference
rename to tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.reference
diff --git a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated.sql b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.sql
similarity index 92%
rename from tests/queries/0_stateless/01201_drop_column_compact_part_replicated.sql
rename to tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.sql
index 53cf940de6d..2aa903d99f0 100644
--- a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated.sql
+++ b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.sql
@@ -3,7 +3,7 @@ set replication_alter_partitions_sync = 2;
 drop table if exists mt_compact;
 
 create table mt_compact(a UInt64, b UInt64 DEFAULT a * a, s String, n Nested(x UInt32, y String), lc LowCardinality(String))
-engine = ReplicatedMergeTree('/clickhouse/test/mt_compact_replicated', '1')
+engine = ReplicatedMergeTree('/clickhouse/test_01201/mt_compact_replicated', '1')
 order by a partition by a % 10
 settings index_granularity = 8,
 min_rows_for_wide_part = 10;
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
index 5f1372bd5fd..fc2a74d1a93 100644
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
@@ -1,7 +1,7 @@
 1
-CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01213/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 renamed_value1
-CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `renamed_value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `renamed_value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01213/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 1
 date	key	renamed_value1	value2	value3
 2019-10-02	1	1	1	1
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
index cba936077d1..ae0c8324468 100755
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
@@ -14,7 +14,7 @@ CREATE TABLE table_for_rename_replicated
   value2 String,
   value3 String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/table_for_rename_replicated', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01213/table_for_rename_replicated', '1')
 PARTITION BY date
 ORDER BY key;
 "
diff --git a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql
index 5c62d5d9107..616a213e46c 100644
--- a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql
@@ -9,7 +9,7 @@ CREATE TABLE table_for_rename_pk
   value1 String,
   value2 String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/table_for_rename_pk', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01213/table_for_rename_pk1', '1')
 PARTITION BY date
 ORDER BY (key1, pow(key2, 2), key3);
 
@@ -23,8 +23,7 @@ ALTER TABLE table_for_rename_pk RENAME COLUMN key3 TO renamed_key3; --{serverErr
 
 ALTER TABLE table_for_rename_pk RENAME COLUMN key2 TO renamed_key2; --{serverError 524}
 
-DROP TABLE IF EXISTS table_for_rename_pk NO DELAY;
-SELECT sleep(1) FORMAT Null;
+DROP TABLE IF EXISTS table_for_rename_pk;
 
 DROP TABLE IF EXISTS table_for_rename_with_primary_key;
 
@@ -38,7 +37,7 @@ CREATE TABLE table_for_rename_with_primary_key
   value2 String,
   INDEX idx (value1) TYPE set(1) GRANULARITY 1
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/table_for_rename_pk', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01213/table_for_rename_pk2', '1')
 PARTITION BY date
 ORDER BY (key1, key2, key3)
 PRIMARY KEY (key1, key2);
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.reference
index a4759ecb0f7..8b5199a44d1 100644
--- a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference
+++ b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference
@@ -8,10 +8,10 @@ Hello 1
 Word 1
 date1	date2	value1	value2
 2019-10-02	2018-10-02	1	1
-CREATE TABLE default.table_rename_with_ttl\n(\n    `date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_rename_with_ttl\n(\n    `date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
 renamed_date1	date2	value1	value2
 2019-10-02	2018-10-02	1	1
-CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
 renamed_date1	renamed_date2	value1	value2
 2019-10-02	2018-10-02	1	1
-CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `renamed_date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL renamed_date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `renamed_date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL renamed_date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
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.sql
index fa4c02aa58c..d3f83c0cbb0 100644
--- a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql
@@ -38,7 +38,7 @@ CREATE TABLE table_rename_with_ttl
   value1 String,
   value2 String TTL date1 + INTERVAL 10000 MONTH
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/test/table_rename_with_ttl', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/test_01213/table_rename_with_ttl', '1')
 ORDER BY tuple()
 TTL date2 + INTERVAL 10000 MONTH;
 
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.sql
index 827161d4d57..3d7a3227f0c 100644
--- a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql
+++ b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql
@@ -8,8 +8,8 @@ DROP TABLE test_alter;
 DROP TABLE IF EXISTS test_alter_r1;
 DROP TABLE IF EXISTS test_alter_r2;
 
-CREATE TABLE test_alter_r1 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter', 'r1') ORDER BY s PARTITION BY x;
-CREATE TABLE test_alter_r2 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter', 'r2') ORDER BY s PARTITION BY x;
+CREATE TABLE test_alter_r1 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01267/alter', 'r1') ORDER BY s PARTITION BY x;
+CREATE TABLE test_alter_r2 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01267/alter', 'r2') ORDER BY s PARTITION BY x;
 
 ALTER TABLE test_alter_r1 MODIFY COLUMN s DEFAULT 'Hello' SETTINGS replication_alter_partitions_sync = 2;
 ALTER TABLE test_alter_r2 MODIFY COLUMN x DEFAULT '2000-01-01' SETTINGS replication_alter_partitions_sync = 2;
diff --git a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference
index 6a9d5a3bdcf..84ca8273128 100644
--- a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference
+++ b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference
@@ -7,7 +7,7 @@
 2019-10-01	6	6	7	8
 2019-10-02	7	7	8	9
 2019-10-03	8	8	9	10
-CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value4` String,\n    `value5` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value4) < toInt64(value5),\n    CONSTRAINT cs_value2 CHECK toInt64(value5) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value4` String,\n    `value5` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value4) < toInt64(value5),\n    CONSTRAINT cs_value2 CHECK toInt64(value5) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01277/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 2019-10-01	0	0	1	2
 2019-10-02	1	1	2	3
 2019-10-03	2	2	3	4
@@ -38,7 +38,7 @@ CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n
 2019-10-01	18	18	19	20
 2019-10-02	19	19	20	21
 -- rename columns back --
-CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value1) < toInt64(value2),\n    CONSTRAINT cs_value2 CHECK toInt64(value2) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value1) < toInt64(value2),\n    CONSTRAINT cs_value2 CHECK toInt64(value2) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01277/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 2019-10-01	0	0	1	2
 2019-10-02	1	1	2	3
 2019-10-03	2	2	3	4
diff --git a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql
index 2d3a7e0198a..28f17dced97 100644
--- a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql
+++ b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql
@@ -10,7 +10,7 @@ CREATE TABLE table_for_rename1
   CONSTRAINT cs_value1 CHECK toInt64(value1) < toInt64(value2),
   CONSTRAINT cs_value2 CHECK toInt64(value2) < toInt64(value3)
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_for_rename', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01277/test_for_rename', '1')
 PARTITION BY date
 ORDER BY key;
 
diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index f7623ee3671..0a47c6df46c 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -9,7 +9,7 @@ function thread()
 {
     while true; do
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1;
-            CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
+            CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01305/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
                 grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now|is already finished removing by another replica right now|Removing leftovers from table|Another replica was suddenly created|was successfully removed from ZooKeeper|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time'
         done
 }
diff --git a/tests/queries/0_stateless/01307_multiple_leaders.reference b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.reference
similarity index 100%
rename from tests/queries/0_stateless/01307_multiple_leaders.reference
rename to tests/queries/0_stateless/01307_multiple_leaders_zookeeper.reference
diff --git a/tests/queries/0_stateless/01307_multiple_leaders.sh b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
similarity index 86%
rename from tests/queries/0_stateless/01307_multiple_leaders.sh
rename to tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
index 59c46d09096..3b29922b8fc 100755
--- a/tests/queries/0_stateless/01307_multiple_leaders.sh
+++ b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
@@ -11,7 +11,7 @@ DATA_SIZE=200
 SEQ=$(seq 0 $(($NUM_REPLICAS - 1)))
 
 for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "DROP TABLE IF EXISTS r$REPLICA"; done
-for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE r$REPLICA (x UInt64) ENGINE = ReplicatedMergeTree('/test/table', 'r$REPLICA') ORDER BY x SETTINGS min_bytes_for_wide_part = '10M';"; done
+for REPLICA in $SEQ; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE r$REPLICA (x UInt64) ENGINE = ReplicatedMergeTree('/test_01307/table', 'r$REPLICA') ORDER BY x SETTINGS min_bytes_for_wide_part = '10M';"; done
 
 function thread()
 {
diff --git a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
index da6b5d459c9..95a8bcb5bb3 100755
--- a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
+++ b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
@@ -10,7 +10,7 @@ $CLICKHOUSE_CLIENT --query "
         key UInt64,
         value String
     )
-    ENGINE = ReplicatedMergeTree('/clickhouse/tables/mutation_table', '1')
+    ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01318/mutation_table', '1')
     ORDER BY key
     PARTITION BY key % 10
 "
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition.reference b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.reference
similarity index 100%
rename from tests/queries/0_stateless/01320_create_sync_race_condition.reference
rename to tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.reference
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition.sh b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
similarity index 83%
rename from tests/queries/0_stateless/01320_create_sync_race_condition.sh
rename to tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
index 2661a63b160..5bbec57a236 100755
--- a/tests/queries/0_stateless/01320_create_sync_race_condition.sh
+++ b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
@@ -9,7 +9,7 @@ $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS r;"
 
 function thread1()
 {
-    while true; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE r (x UInt64) ENGINE = ReplicatedMergeTree('/test/table', 'r') ORDER BY x; DROP TABLE r;"; done
+    while true; do $CLICKHOUSE_CLIENT -n --query "CREATE TABLE r (x UInt64) ENGINE = ReplicatedMergeTree('/test_01320/table', 'r') ORDER BY x; DROP TABLE r;"; done
 }
 
 function thread2()
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
index 3f58142a16f..e7db2788824 100644
--- a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
+++ b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
@@ -1,3 +1,3 @@
 10
 5
-CREATE TABLE default.alter_mt\n(\n    `key` UInt64,\n    `value` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/alter_mt\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_mt\n(\n    `key` UInt64,\n    `value` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01338/alter_mt\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
index e572dea4b58..6a852357fa6 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS alter_mt"
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE alter_mt (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/alter_mt', '1') ORDER BY key"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE alter_mt (key UInt64, value String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01338/alter_mt', '1') ORDER BY key"
 
 $CLICKHOUSE_CLIENT --query "INSERT INTO alter_mt SELECT number, toString(number) FROM numbers(5)"
 
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated.reference b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.reference
similarity index 100%
rename from tests/queries/0_stateless/01346_alter_enum_partition_key_replicated.reference
rename to tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.reference
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated.sql b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.sql
similarity index 92%
rename from tests/queries/0_stateless/01346_alter_enum_partition_key_replicated.sql
rename to tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.sql
index 1a6c30d9571..0719282734a 100644
--- a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated.sql
+++ b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.sql
@@ -1,8 +1,8 @@
 DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS test2;
 
-CREATE TABLE test (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/test/table', 'r1') PARTITION BY x ORDER BY y;
-CREATE TABLE test2 (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/test/table', 'r2') PARTITION BY x ORDER BY y;
+CREATE TABLE test (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01346/table', 'r1') PARTITION BY x ORDER BY y;
+CREATE TABLE test2 (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01346/table', 'r2') PARTITION BY x ORDER BY y;
 INSERT INTO test VALUES ('hello', 'test');
 
 SELECT * FROM test;
diff --git a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes.reference b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.reference
similarity index 100%
rename from tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes.reference
rename to tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.reference
diff --git a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes.sh b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
similarity index 69%
rename from tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes.sh
rename to tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
index 2ab3e6dd24f..798b3dd4a57 100755
--- a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes.sh
+++ b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
@@ -11,8 +11,8 @@ SCALE=5000
 $CLICKHOUSE_CLIENT -n --query "
     DROP TABLE IF EXISTS r1;
     DROP TABLE IF EXISTS r2;
-    CREATE TABLE r1 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/r', '1') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
-    CREATE TABLE r2 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/r', '2') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
+    CREATE TABLE r1 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01396/r', '1') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
+    CREATE TABLE r2 (x UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01396/r', '2') ORDER BY x SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 1, parts_to_throw_insert = 100000, max_replicated_logs_to_keep = 10;
     DETACH TABLE r2;
 "
 
@@ -28,16 +28,16 @@ for _ in {1..60}; do
 done
 
 
-$CLICKHOUSE_CLIENT --query "SELECT numChildren < $((SCALE / 4)) FROM system.zookeeper WHERE path = '/clickhouse/tables/r' AND name = 'log'";
+$CLICKHOUSE_CLIENT --query "SELECT numChildren < $((SCALE / 4)) FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r' AND name = 'log'";
 echo -e '\n---\n';
-$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/r/replicas/1' AND name = 'is_lost'";
-$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/r/replicas/2' AND name = 'is_lost'";
+$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r/replicas/1' AND name = 'is_lost'";
+$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r/replicas/2' AND name = 'is_lost'";
 echo -e '\n---\n';
 
 $CLICKHOUSE_CLIENT --query "ATTACH TABLE r2"
 $CLICKHOUSE_CLIENT --receive_timeout 600 --query "SYSTEM SYNC REPLICA r2" # Need to increase timeout, otherwise it timed out in debug build
 
-$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/r/replicas/2' AND name = 'is_lost'";
+$CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/test_01396/r/replicas/2' AND name = 'is_lost'";
 
 $CLICKHOUSE_CLIENT -n --query "
     DROP TABLE IF EXISTS r1;
diff --git a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
index 1f14a891dd4..cd59c6e46d7 100755
--- a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
+++ b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT --query "
         key UInt64,
         value String
     )
-    ENGINE = ReplicatedMergeTree('/clickhouse/tables/mutation_table', '1')
+    ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01414/mutation_table', '1')
     ORDER BY tuple()
     PARTITION BY date
 "
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
index 9e255ff2548..d9011e2acdf 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
@@ -10,7 +10,7 @@ FREEZE_OUT_STRUCTURE='backup_name String, backup_path String , part_backup_path
 # setup
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS table_for_freeze_replicated;"
-${CLICKHOUSE_CLIENT} --query "CREATE TABLE table_for_freeze_replicated (key UInt64, value String) ENGINE = ReplicatedMergeTree('/test/table_for_freeze_replicated', '1') ORDER BY key PARTITION BY key % 10;"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE table_for_freeze_replicated (key UInt64, value String) ENGINE = ReplicatedMergeTree('/test_01417/table_for_freeze_replicated', '1') ORDER BY key PARTITION BY key % 10;"
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO table_for_freeze_replicated SELECT number, toString(number) from numbers(10);"
 
 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE table_for_freeze_replicated FREEZE WITH NAME 'test_01417' FORMAT TSVWithNames SETTINGS alter_partition_verbose_result = 1;" \