diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 1d034283e6808..befd00065cbdb 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -24,3 +24,14 @@ tasks:
     test_flags:
       - "--config=coverage"
       - "--config=clang"
+  fuzz_coverage:
+    name: "Fuzz-Coverage"
+    platform: ubuntu1804
+    shell_commands:
+      - "bazel/setup_clang.sh /usr/lib/llvm-10"
+    test_targets:
+      - "//test/server:server_fuzz_test"
+    test_flags:
+      - "--config=fuzz-coverage"
+      - "--config=coverage"
+      - "--config=clang"
diff --git a/.bazelrc b/.bazelrc
index 3f2fab533837e..320975bc9114a 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -144,9 +144,9 @@ build:coverage --experimental_use_llvm_covmap
 build:coverage --collect_code_coverage
 build:coverage --test_tag_filters=-nocoverage
 build:coverage --instrumentation_filter="//source(?!/common/chromium_url|/extensions/quic_listeners/quiche/platform)[/:],//include[/:]"
-coverage:test-coverage --test_arg="-l trace"
-coverage:fuzz-coverage --config=plain-fuzzer
-coverage:fuzz-coverage --run_under=@envoy//bazel/coverage:fuzz_coverage_wrapper.sh
+build:test-coverage --test_arg="-l trace"
+build:fuzz-coverage --config=plain-fuzzer
+build:fuzz-coverage --run_under=@envoy//bazel/coverage:fuzz_coverage_wrapper.sh
 
 # Remote execution: https://docs.bazel.build/versions/master/remote-execution.html
 build:rbe-toolchain --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1