diff --git a/config_host.mk.in b/config_host.mk.in
index 8b5b6ea6bb29..b8778cf7e509 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -149,7 +149,6 @@ export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@
-export ENABLE_FUZZERS=@ENABLE_FUZZERS@
 export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
 export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DCONF=@ENABLE_DCONF@
diff --git a/configure.ac b/configure.ac
index d3bafb98b93c..b236727456f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9071,7 +9071,6 @@ else
     BUILD_TYPE="$BUILD_TYPE FUZZERS"
 fi
 AC_SUBST(LIB_FUZZING_ENGINE)
-AC_SUBST(ENABLE_FUZZERS)
 
 dnl ===================================================================
 dnl Check for system zlib
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index f85bac2f1cb7..f8a34880b338 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -140,7 +140,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
 endif
 endif
 
-ifneq ($(ENABLE_FUZZERS),)
+ifneq (,$(filter FUZZERS,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,vcl,\
     CustomTarget_nativecore \
     CustomTarget_nativecalc \