diff --git a/.bazelrc b/.bazelrc
index 1224c91fd8bc7..3452cc1c89f94 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -188,7 +188,6 @@ build:remote-ci --remote_executor=grpcs://remotebuildexecution.googleapis.com
 # Fuzz builds
 build:asan-fuzzer --config=clang-asan
 build:asan-fuzzer --define=FUZZING_ENGINE=libfuzzer
-build:asan-fuzzer --copt=-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 build:asan-fuzzer --copt=-fsanitize=fuzzer-no-link
 build:asan-fuzzer --copt=-fno-omit-frame-pointer
 # Remove UBSAN halt_on_error to avoid crashing on protobuf errors.
diff --git a/bazel/envoy_test.bzl b/bazel/envoy_test.bzl
index dd49268d664fa..7e4c2d309431d 100644
--- a/bazel/envoy_test.bzl
+++ b/bazel/envoy_test.bzl
@@ -93,6 +93,7 @@ def envoy_cc_fuzz_test(
         srcs = tar_src,
         testonly = 1,
     )
+    fuzz_copts = ["-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"]
     test_lib_name = name + "_lib"
     envoy_cc_test_library(
         name = test_lib_name,
@@ -105,7 +106,7 @@ def envoy_cc_fuzz_test(
     )
     native.cc_test(
         name = name,
-        copts = envoy_copts("@envoy", test = True),
+        copts = fuzz_copts + envoy_copts("@envoy", test = True),
         linkopts = _envoy_test_linkopts(),
         linkstatic = 1,
         args = ["$(locations %s)" % corpus_name],
@@ -129,7 +130,7 @@ def envoy_cc_fuzz_test(
     # provide a path to FuzzingEngine.
     native.cc_binary(
         name = name + "_driverless",
-        copts = envoy_copts("@envoy", test = True),
+        copts = fuzz_copts + envoy_copts("@envoy", test = True),
         linkopts = ["-lFuzzingEngine"] + _envoy_test_linkopts(),
         linkstatic = 1,
         testonly = 1,
@@ -139,7 +140,7 @@ def envoy_cc_fuzz_test(
 
     native.cc_test(
         name = name + "_with_libfuzzer",
-        copts = envoy_copts("@envoy", test = True),
+        copts = fuzz_copts + envoy_copts("@envoy", test = True),
         linkopts = ["-fsanitize=fuzzer"] + _envoy_test_linkopts(),
         linkstatic = 1,
         testonly = 1,