diff --git a/dbms/src/Server/config.xml b/dbms/src/Server/config.xml
index 22c62652ec4..9705d5ddaf8 100644
--- a/dbms/src/Server/config.xml
+++ b/dbms/src/Server/config.xml
@@ -127,7 +127,17 @@
     <!-- Configuration of clusters that could be used in Distributed tables.
          https://clickhouse.yandex/reference_en.html#Distributed
       -->
-    <remote_servers incl="clickhouse_remote_servers" />
+    <remote_servers incl="clickhouse_remote_servers" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+    </remote_servers>
 
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
diff --git a/dbms/tests/clickhouse-test b/dbms/tests/clickhouse-test
index 8abb1a5adcd..fd2c9ce6c2c 100755
--- a/dbms/tests/clickhouse-test
+++ b/dbms/tests/clickhouse-test
@@ -90,10 +90,9 @@ def main(args):
 
     failures_total = 0
 
+    # Keep same default values as in queries/0_stateless/00000_sh_lib.sh
+    os.environ.setdefault("CLICKHOUSE_BINARY", args.binary)
     os.environ.setdefault("CLICKHOUSE_CLIENT", args.client)
-    os.environ.setdefault("CLICKHOUSE_BINARY", "clickhouse")
-    os.environ.setdefault("CLICKHOUSE_URL", "http://localhost:8123/")
-    os.environ.setdefault("CLICKHOUSE_CONFIG", "/etc/clickhouse-server/config.xml")
 
     for suite in sorted(os.listdir(base_dir)):
         if SERVER_DIED:
@@ -266,7 +265,8 @@ def main(args):
 if __name__ == '__main__':
     parser = ArgumentParser(description = 'ClickHouse functional tests')
     parser.add_argument('-q', '--queries', default = 'queries', help = 'Path to queries dir')
-    parser.add_argument('-c', '--client', default = 'clickhouse-client', help = 'Client program')
+    parser.add_argument('-b', '--binary', default = 'clickhouse', help = 'Main clickhouse binary')
+    parser.add_argument('-c', '--client', help = 'Client program')
     parser.add_argument('-o', '--output', help = 'Output xUnit compliant test report directory')
     parser.add_argument('-t', '--timeout', type = int, default = 600, help = 'Timeout for each test case in seconds')
     parser.add_argument('test', nargs = '?', help = 'Optional test case name regex')
@@ -281,14 +281,6 @@ if __name__ == '__main__':
     group.add_argument('--no-shard', action = 'store_false', default = None, dest = 'shard', help = 'Do not run shard related tests')
 
     args = parser.parse_args()
-
+    if args.client is None:
+        args.client = args.binary + ' client'
     main(args)
-
-#
-# TODO:
-# Pass variables to tests. currently used values:
-# /etc/clickhouse-server/config.xml
-# clickhouse           (path to binary)
-# clickhouse-client    (path to binary)
-# http://localhost:8123/
-#
diff --git a/dbms/tests/queries/shell_config.sh b/dbms/tests/queries/shell_config.sh
new file mode 100644
index 00000000000..2f73e881757
--- /dev/null
+++ b/dbms/tests/queries/shell_config.sh
@@ -0,0 +1,13 @@
+
+export CLICKHOUSE_BINARY=${CLICKHOUSE_BINARY:="clickhouse"}
+export CLICKHOUSE_CLIENT=${CLICKHOUSE_CLIENT:="${CLICKHOUSE_BINARY} client"}
+
+export CLICKHOUSE_HOST=${CLICKHOUSE_HOST:="localhost"}
+export CLICKHOUSE_PORT_TCP=${CLICKHOUSE_PORT_TCP:="9000"}
+export CLICKHOUSE_PORT_HTTP=${CLICKHOUSE_PORT_HTTP:="8123"}
+export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:="8443"}
+export CLICKHOUSE_PORT_HTTP_PROTO=${CLICKHOUSE_PORT_HTTP_PROTO:="http"}
+export CLICKHOUSE_URL=${CLICKHOUSE_URL:="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/"}
+export CLICKHOUSE_CONFIG=${CLICKHOUSE_CONFIG:="/etc/clickhouse-server/config.xml"}
+export CLICKHOUSE_EXTRACT_CONFIG=${CLICKHOUSE_EXTRACT_CONFIG:="$CLICKHOUSE_BINARY extract-from-config -c $CLICKHOUSE_CONFIG"}
+export CLICKHOUSE_CURL=${CLICKHOUSE_CURL:="curl --max-time 5"}