diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index 9c8f3d087a3..59998b4a507 100644
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@@ -1,11 +1,12 @@
-FROM ubuntu:16.04
+FROM ubuntu:17.10
 
 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
 ARG version=\*
 
 RUN apt-get update && \
-    apt-get install -y apt-transport-https && \
+    apt-get install -y apt-transport-https dirmngr && \
     mkdir -p /etc/apt/sources.list.d && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 && \
     echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \
     apt-get update && \
     apt-get install --allow-unauthenticated -y clickhouse-client=$version locales && \
diff --git a/docker/server/docker_related_config.xml b/docker/server/docker_related_config.xml
index ab6f82ad4c4..e1df3bb3890 100644
--- a/docker/server/docker_related_config.xml
+++ b/docker/server/docker_related_config.xml
@@ -3,4 +3,10 @@
     <listen_host>0.0.0.0</listen_host>
     <listen_host>::</listen_host>
     <listen_try>1</listen_try>
+
+    <!--
+    <logger>
+        <console>1</console>
+    </logger>
+    -->
 </yandex>
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
new file mode 100644
index 00000000000..75c9eba4d3b
--- /dev/null
+++ b/docker/test/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:17.10
+
+ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
+ARG version=\*
+
+RUN apt-get update && \
+    apt-get install -y apt-transport-https dirmngr && \
+    mkdir -p /etc/apt/sources.list.d && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 && \
+    echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \
+    apt-get update && \
+    apt-get install --allow-unauthenticated -y clickhouse-test && \
+    rm -rf /var/lib/apt/lists/* /var/cache/debconf && \
+    apt-get clean
+
+# clickhouse-test bug: dotn start without server config, remove after release 1.1.54372 :
+RUN mkdir -p /etc/clickhouse-server && echo "<y></y>" > /etc/clickhouse-server/config.xml
+
+ENTRYPOINT ["/usr/bin/clickhouse-test"]
diff --git a/docker/test/README.md b/docker/test/README.md
new file mode 100644
index 00000000000..0833aacb822
--- /dev/null
+++ b/docker/test/README.md
@@ -0,0 +1,5 @@
+# ClickHouse Test Docker Image
+
+## License
+
+View [license information](https://github.com/yandex/ClickHouse/blob/master/LICENSE) for the software contained in this image.