3 files changed, 16 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/fuzzers.template b/templates/tools/dockerfile/test/fuzzers.template
index d9e3806191..d4e3d64411 100644
--- a/templates/tools/dockerfile/test/fuzzers.template
+++ b/templates/tools/dockerfile/test/fuzzers.template
@@ -37,6 +37,7 @@ template: |
 
   <%include file="../apt_get_basic.include"/>
   <%include file="../cxx_deps.include"/>
+  <%include file="../run_tests_addons.include"/>
   RUN git clone -n -b master http://llvm.org/git/llvm.git && ${'\\'}
     cd llvm && ${'\\'}
     git checkout 308857f && ${'\\'}
diff --git a/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile b/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile
index b84d51136e..beae39c596 100644
--- a/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile
+++ b/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile
@@ -67,6 +67,21 @@ RUN apt-get update && apt-get install -y time && apt-get clean
 # C++ dependencies
 RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean
 
+# Prepare ccache
+RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
+RUN ln -s /usr/bin/ccache /usr/local/bin/g++
+RUN ln -s /usr/bin/ccache /usr/local/bin/cc
+RUN ln -s /usr/bin/ccache /usr/local/bin/c++
+RUN ln -s /usr/bin/ccache /usr/local/bin/clang
+RUN ln -s /usr/bin/ccache /usr/local/bin/clang++
+
+#======================
+# Zookeeper dependencies
+# TODO(jtattermusch): is zookeeper still needed?
+RUN apt-get install -y libzookeeper-mt-dev
+
+RUN mkdir /var/local/jenkins
+
 RUN git clone -n -b master http://llvm.org/git/llvm.git && \
   cd llvm && \
   git checkout 308857f && \
diff --git a/tools/fuzzer/build_and_run_fuzzer.sh b/tools/fuzzer/build_and_run_fuzzer.sh
index 67e3a5b99f..ace79523ea 100755
--- a/tools/fuzzer/build_and_run_fuzzer.sh
+++ b/tools/fuzzer/build_and_run_fuzzer.sh
@@ -32,6 +32,5 @@
 set -ex
 
 git submodule update --init
-make run_dep_checks
 make CONFIG=$config $1
 bins/$config/$1