diff --git a/configure.ac b/configure.ac
index db27ae5c42..21f2eda7e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1100,6 +1100,8 @@ AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"])
 AM_CONDITIONAL([ENABLE_FUZZING], [test "${enable_fuzzing}" = "yes"])
 AM_CONDITIONAL([ENABLE_SHARED], [test "${enable_shared}" = "yes"])
 AS_IF([test "${enable_shared}" = "yes"], [AC_DEFINE([ENABLE_SHARED], [1], [Enable shared libraries])])
+AM_CONDITIONAL([ENABLE_STATIC], [test "${enable_static}" = "yes"])
+AS_IF([test "${enable_static}" = "yes"], [AC_DEFINE([ENABLE_static], [1], [Enable static libraries])])
 
 if test "${enable_pedantic}" = "yes"; then
 	enable_strict="yes";
diff --git a/src/tests/fuzzing/Makefile.am b/src/tests/fuzzing/Makefile.am
index fa83ceddf1..55f55f6d8c 100644
--- a/src/tests/fuzzing/Makefile.am
+++ b/src/tests/fuzzing/Makefile.am
@@ -7,8 +7,11 @@ LIBS = $(FUZZING_LIBS)\
 	$(top_builddir)/src/common/libcompat.la
 
 noinst_PROGRAMS = fuzz_asn1_print fuzz_asn1_sig_value fuzz_pkcs15_decode fuzz_pkcs15_reader \
-					fuzz_scconf_parse_string fuzz_pkcs15init \
-					fuzz_pkcs15_encode fuzz_card
+					fuzz_scconf_parse_string fuzz_pkcs15_encode fuzz_card
+
+if ENABLE_STATIC
+noinst_PROGRAMS += fuzz_pkcs15init
+endif
 
 noinst_HEADERS = fuzzer_reader.h