diff --git a/templates/tools/dockerfile/clang_update.include b/templates/tools/dockerfile/clang_update.include
index a44fe717d88b7fc8d70db1111514fb1ba52a4096..4f827c8dc21b9f89d1a7bae64461731e7f415b85 100644
--- a/templates/tools/dockerfile/clang_update.include
+++ b/templates/tools/dockerfile/clang_update.include
@@ -1,5 +1,5 @@
 #=================
-# Update clang to a version with improved tsan
+# Update clang to a version with improved tsan and fuzzing capabilities
 
 RUN apt-get update && apt-get -y install python cmake && apt-get clean
 
diff --git a/templates/tools/dockerfile/test/fuzzers.template b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template
similarity index 86%
rename from templates/tools/dockerfile/test/fuzzers.template
rename to templates/tools/dockerfile/test/fuzzer/Dockerfile.template
index 6cf8694f3b941a5b3d78d73156c345209298f8e8..479be0556a097a4580fcc1fc6d3fc2105385bcb1 100644
--- a/templates/tools/dockerfile/test/fuzzers.template
+++ b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template
@@ -1,9 +1,5 @@
 %YAML 1.2
----
-foreach: targets
-output_name: ${selected.name}/Dockerfile
-cond: selected.build == 'fuzzer'
-template: |
+--- |
   # Copyright 2015-2016, Google Inc.
   # All rights reserved.
   #
@@ -35,10 +31,10 @@ template: |
 
   FROM debian:jessie
 
-  <%include file="../apt_get_basic.include"/>
-  <%include file="../cxx_deps.include"/>
-  <%include file="../clang_update.include"/>
-  <%include file="../run_tests_addons.include"/>
+  <%include file="../../apt_get_basic.include"/>
+  <%include file="../../cxx_deps.include"/>
+  <%include file="../../clang_update.include"/>
+  <%include file="../../run_tests_addons.include"/>
   RUN clang++ -c -g -O2 -std=c++11 llvm/lib/Fuzzer/*.cpp -IFuzzer
   RUN ar ruv libFuzzer.a Fuzzer*.o
   RUN mv libFuzzer.a /usr/lib
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
index 685d2038b0a6ebd395a77f0d6257e248625ef250..6c7aece4ff5c71c324e6c4776664012649ca9984 100644
--- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
@@ -68,7 +68,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
 RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean
 
 #=================
-# Update clang to a version with improved tsan
+# Update clang to a version with improved tsan and fuzzing capabilities
 
 RUN apt-get update && apt-get -y install python cmake && apt-get clean
 
diff --git a/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile b/tools/dockerfile/test/fuzzer/Dockerfile
similarity index 98%
rename from tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile
rename to tools/dockerfile/test/fuzzer/Dockerfile
index 9335a2a97c48a159f2c2d7602cda4471f93e2c8c..7b35c009e3780478e9cad62df0a8ea43c636210a 100644
--- a/tools/dockerfile/test/fuzzers/json_fuzzer_test/Dockerfile
+++ b/tools/dockerfile/test/fuzzer/Dockerfile
@@ -68,7 +68,7 @@ RUN apt-get update && apt-get install -y time && apt-get clean
 RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean
 
 #=================
-# Update clang to a version with improved tsan
+# Update clang to a version with improved tsan and fuzzing capabilities
 
 RUN apt-get update && apt-get -y install python cmake && apt-get clean
 
diff --git a/tools/fuzzer/build_and_run_fuzzer.sh b/tools/fuzzer/build_and_run_fuzzer.sh
index 6b63ef02ca81b110edc253ad311a4b4e7461258b..a2108988d8953a7c9de9921bdf5917902cf562c6 100755
--- a/tools/fuzzer/build_and_run_fuzzer.sh
+++ b/tools/fuzzer/build_and_run_fuzzer.sh
@@ -31,8 +31,5 @@
 
 set -ex
 
-git submodule update --init
-find . | sort
-make CONFIG=$config run_dep_checks
 make CONFIG=$config $1
 bins/$config/$1
diff --git a/tools/jenkins/run_fuzzer.sh b/tools/jenkins/run_fuzzer.sh
index f2423c40ff78278d6dd7f2983fa7c2f3125ca29d..94ee493700f94b71893acace3445ad8765635e8d 100755
--- a/tools/jenkins/run_fuzzer.sh
+++ b/tools/jenkins/run_fuzzer.sh
@@ -34,7 +34,7 @@ set -ex
 
 export RUN_COMMAND="tools/fuzzer/build_and_run_fuzzer.sh $1"
 export DOCKER_RUN_SCRIPT=tools/jenkins/docker_run.sh
-export DOCKERFILE_DIR=tools/dockerfile/test/fuzzers/$1
+export DOCKERFILE_DIR=tools/dockerfile/test/fuzzer
 export OUTPUT_DIR=
 
 tools/jenkins/build_and_run_docker.sh \