diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4e46145e3a..5c37f32ebdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -543,4 +543,5 @@ if (GLIBC_COMPATIBILITY OR USE_INTERNAL_UNWIND_LIBRARY_FOR_EXCEPTION_HANDLING)
     add_default_dependencies(libprotobuf)
     add_default_dependencies(base64)
     add_default_dependencies(readpassphrase)
+    add_default_dependencies(unwind_static)
 endif ()
diff --git a/contrib/libunwind-cmake/CMakeLists.txt b/contrib/libunwind-cmake/CMakeLists.txt
index e0622e73bde..3d4cd319089 100644
--- a/contrib/libunwind-cmake/CMakeLists.txt
+++ b/contrib/libunwind-cmake/CMakeLists.txt
@@ -29,4 +29,3 @@ add_library(unwind_static ${LIBUNWIND_SOURCES})
 target_include_directories(unwind_static PUBLIC ${LIBUNWIND_SOURCE_DIR}/include)
 target_compile_definitions(unwind_static PRIVATE -D_LIBUNWIND_NO_HEAP=1 -D_DEBUG -D_LIBUNWIND_IS_NATIVE_ONLY)
 target_compile_options(unwind_static PRIVATE -fno-exceptions -funwind-tables -fno-sanitize=all -nostdinc++ -fno-rtti)
-
diff --git a/docker/test/integration/Dockerfile b/docker/test/integration/Dockerfile
index d582247db74..c5f4629ba72 100644
--- a/docker/test/integration/Dockerfile
+++ b/docker/test/integration/Dockerfile
@@ -1,8 +1,10 @@
 # docker build -t yandex/clickhouse-integration-test .
 FROM ubuntu:18.04
 
+RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list
+
 RUN apt-get update \
-    && env DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata python llvm-6.0 llvm-6.0-dev libreadline-dev libicu-dev bsdutils \
+    && env DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata python llvm-6.0 llvm-6.0-dev libreadline-dev libicu-dev bsdutils llvm-8 \
     && rm -rf \
         /var/lib/apt/lists/* \
         /var/cache/debconf \
@@ -15,5 +17,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN echo "TSAN_OPTIONS='halt_on_error=1 history_size=7'" >> /etc/environment; \
     echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \
     echo "ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; \
+    echo "TSAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer" >> /etc/environment; \
     echo "UBSAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; \
     echo "LLVM_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment;