diff --git a/dbms/tests/queries/0_stateless/00634_logging_shard.reference b/dbms/tests/queries/0_stateless/00634_logging_shard.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dbms/tests/queries/0_stateless/00634_logging_shard.sh b/dbms/tests/queries/0_stateless/00634_logging_shard.sh
new file mode 100755
index 00000000000..0736354312b
--- /dev/null
+++ b/dbms/tests/queries/0_stateless/00634_logging_shard.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+set -e
+
+# Get all server logs
+export CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL="trace"
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+. $CURDIR/../shell_config.sh
+
+cur_name=${BASH_SOURCE[0]}
+server_logs_file=$cur_name"_server.logs"
+server_logs="--server_logs_file=$server_logs_file"
+rm -f "$server_logs_file"
+
+settings="$server_logs --log_queries=1 --log_query_threads=1 --log_profile_events=1 --log_query_settings=1"
+
+
+# Check that logs from remote servers are passed from client
+
+# SELECT
+> "$server_logs_file"
+$CLICKHOUSE_CLIENT $settings -q "SELECT 1 FROM system.one FORMAT Null"
+lines_one_server=`cat "$server_logs_file" | wc -l`
+
+> "$server_logs_file"
+$CLICKHOUSE_CLIENT $settings -q "SELECT 1 FROM remote('127.0.0.2,127.0.0.3', system, one) FORMAT Null"
+lines_two_servers=`cat "$server_logs_file" | wc -l`
+
+(( $lines_two_servers >= 2 * $lines_one_server )) || echo "Fail: $lines_two_servers $lines_one_server"
+
+# INSERT
+$CLICKHOUSE_CLIENT $settings -q "DROP TABLE IF EXISTS test.null"
+$CLICKHOUSE_CLIENT $settings -q "CREATE TABLE test.null (i Int8) ENGINE = Null"
+
+> "$server_logs_file"
+$CLICKHOUSE_CLIENT $settings -q "INSERT INTO test.null VALUES (0)"
+lines_one_server=`cat "$server_logs_file" | wc -l`
+
+> "$server_logs_file"
+$CLICKHOUSE_CLIENT $settings -q "INSERT INTO TABLE FUNCTION remote('127.0.0.2', 'test', 'null') VALUES (0)"
+lines_two_servers=`cat "$server_logs_file" | wc -l`
+
+$CLICKHOUSE_CLIENT $settings -q "DROP TABLE IF EXISTS test.null"
+(( $lines_two_servers > $lines_one_server )) || echo "Fail: $lines_two_servers $lines_one_server"
+
+
+# Clean
+rm "$server_logs_file"
diff --git a/dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging_shard.reference b/dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging.reference
similarity index 100%
rename from dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging_shard.reference
rename to dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging.reference
diff --git a/dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging_shard.sh b/dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
similarity index 79%
rename from dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging_shard.sh
rename to dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
index 7ac29a7e10f..18efafac49d 100755
--- a/dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging_shard.sh
+++ b/dbms/tests/queries/0_stateless/00634_performance_introspection_and_logging.sh
@@ -101,35 +101,5 @@ WHERE
     NOT (PVq <= PVt AND PVt <= 1.1 * PVq)
 "
 
-
-# Check that logs from remote servers are passed from client
-
-# SELECT
-> "$server_logs_file"
-$CLICKHOUSE_CLIENT $settings -q "SELECT 1 FROM system.one FORMAT Null"
-lines_one_server=`cat "$server_logs_file" | wc -l`
-
-> "$server_logs_file"
-$CLICKHOUSE_CLIENT $settings -q "SELECT 1 FROM remote('127.0.0.2,127.0.0.3', system, one) FORMAT Null"
-lines_two_servers=`cat "$server_logs_file" | wc -l`
-
-(( $lines_two_servers >= 2 * $lines_one_server )) || echo "Fail: $lines_two_servers $lines_one_server"
-
-# INSERT
-$CLICKHOUSE_CLIENT $settings -q "DROP TABLE IF EXISTS test.null"
-$CLICKHOUSE_CLIENT $settings -q "CREATE TABLE test.null (i Int8) ENGINE = Null"
-
-> "$server_logs_file"
-$CLICKHOUSE_CLIENT $settings -q "INSERT INTO test.null VALUES (0)"
-lines_one_server=`cat "$server_logs_file" | wc -l`
-
-> "$server_logs_file"
-$CLICKHOUSE_CLIENT $settings -q "INSERT INTO TABLE FUNCTION remote('127.0.0.2', 'test', 'null') VALUES (0)"
-lines_two_servers=`cat "$server_logs_file" | wc -l`
-
-$CLICKHOUSE_CLIENT $settings -q "DROP TABLE IF EXISTS test.null"
-(( $lines_two_servers > $lines_one_server )) || echo "Fail: $lines_two_servers $lines_one_server"
-
-
 # Clean
 rm "$server_logs_file"