diff --git a/tests/features/monrun.feature b/tests/features/monrun.feature
index da2e359a..19525ca6 100644
--- a/tests/features/monrun.feature
+++ b/tests/features/monrun.feature
@@ -103,10 +103,10 @@ Feature: ch-monitoring tool
     When we execute command on clickhouse01
     """
     echo -e "
-        <yandex>
+        <clickhouse>
             <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file>
             <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files>
-        </yandex>
+        </clickhouse>
         " > /etc/clickhouse-server/config.d/geo.xml && \
     supervisorctl restart clickhouse-server
     """
diff --git a/tests/features/s3_credentials.feature b/tests/features/s3_credentials.feature
index c2b1792d..48e3b87e 100644
--- a/tests/features/s3_credentials.feature
+++ b/tests/features/s3_credentials.feature
@@ -36,12 +36,12 @@ Feature: ch_s3_credentials tool
     Then we get response
     """
     <?xml version="1.0" encoding="utf-8"?>
-    <yandex>
+    <clickhouse>
         <s3>
             <cloud_storage>
                 <endpoint>storage.com</endpoint>
                 <header>X-YaCloud-SubjectToken: IAM_TOKEN</header>
             </cloud_storage>
         </s3>
-    </yandex>
+    </clickhouse>
     """
\ No newline at end of file
diff --git a/tests/images/clickhouse/config/config.xml b/tests/images/clickhouse/config/config.xml
index 81844f3f..5ca825f1 100644
--- a/tests/images/clickhouse/config/config.xml
+++ b/tests/images/clickhouse/config/config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <console>1</console>
     </logger>
@@ -87,4 +87,4 @@
         <replica>{{ instance_name }}.{{ conf.network_name }}</replica>
         <cluster>cluster</cluster>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/images/clickhouse/config/users.xml b/tests/images/clickhouse/config/users.xml
index b0e53ba9..747cb836 100644
--- a/tests/images/clickhouse/config/users.xml
+++ b/tests/images/clickhouse/config/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <distributed_ddl_task_timeout>20</distributed_ddl_task_timeout>
@@ -36,4 +36,4 @@
     <quotas>
         <default/>
     </quotas>
-</yandex>
+</clickhouse>