diff --git a/dbms/tests/clickhouse-test b/dbms/tests/clickhouse-test
index 3caa9ad6a76..02dbace177d 100755
--- a/dbms/tests/clickhouse-test
+++ b/dbms/tests/clickhouse-test
@@ -64,10 +64,11 @@ def main(args):
 
 	if args.shard is None:
 		try:
-			check_call(['grep', '-q', '127.0.0.2', '/etc/clickhouse-server/config-preprocessed.xml'], )
+			check_call(['grep', '-qE', '"127.0.0.2|<listen_host>::</listen_host>"', '/etc/clickhouse-server/config-preprocessed.xml'], )
 			args.shard = True
 		except CalledProcessError:
-			args.shard = False
+			# TODO: false here after setting <listen_host>::1</listen_host>
+			args.shard = True
 
 	base_dir = os.path.abspath(args.queries)