diff --git a/Make.defaults b/Make.defaults
index 1d2f188b8..f12dc36e7 100644
--- a/Make.defaults
+++ b/Make.defaults
@@ -43,6 +43,7 @@ export OPTIMIZATIONS
 ifneq ($(CCACHE_DISABLE),)
 export CCACHE_DISABLE
 endif
+MAX_FUZZ_TIME	?= 60
 
 SUBDIRS		= $(TOPDIR)/Cryptlib $(TOPDIR)/lib
 
diff --git a/Makefile b/Makefile
index 391ca1986..8a68bf36d 100644
--- a/Makefile
+++ b/Makefile
@@ -469,24 +469,32 @@ else
 	$(PESIGN) -n certdb -i $< -c "shim" -s -o $@ -f
 endif
 
-fuzz fuzz-clean fuzz-coverage fuzz-lto :
+fuzz:
 	@make -f $(TOPDIR)/include/fuzz.mk \
 		COMPILER="$(COMPILER)" \
 		CROSS_COMPILE="$(CROSS_COMPILE)" \
 		CLANG_WARNINGS="$(CLANG_WARNINGS)" \
 		ARCH_DEFINES="$(ARCH_DEFINES)" \
 		EFI_INCLUDES="$(EFI_INCLUDES)" \
-		fuzz-clean $@
+		MAX_FUZZ_TIME=$(MAX_FUZZ_TIME) \
+		$@
 
-test test-clean test-coverage test-lto : | clean-test-results
-test test-clean test-coverage test-lto : generated_sbat_var_defs.h
+test test-coverage test-lto : | clean-test-results
+test test-coverage test-lto : generated_sbat_var_defs.h
 	@make -f $(TOPDIR)/include/test.mk \
 		COMPILER="$(COMPILER)" \
 		CROSS_COMPILE="$(CROSS_COMPILE)" \
 		CLANG_WARNINGS="$(CLANG_WARNINGS)" \
 		ARCH_DEFINES="$(ARCH_DEFINES)" \
 		EFI_INCLUDES="$(EFI_INCLUDES)" \
-		test-clean $@
+		$@
+
+fuzz-clean:
+	@rm -vf random.bin libefi-test.a $(wildcard *-corpus/fuzz*.log)
+
+test-clean:
+	@rm -vf test-random.h libefi-test.a
+	@rm -vf vgcore.*
 
 $(patsubst %.c,%,$(wildcard fuzz-*.c)) :
 	@make -f $(TOPDIR)/include/fuzz.mk EFI_INCLUDES="$(EFI_INCLUDES)" ARCH_DEFINES="$(ARCH_DEFINES)" $@
@@ -496,10 +504,10 @@ $(patsubst %.c,%,$(wildcard test-*.c)) :
 	@make -f $(TOPDIR)/include/test.mk EFI_INCLUDES="$(EFI_INCLUDES)" ARCH_DEFINES="$(ARCH_DEFINES)" $@
 
 clean-fuzz-objs:
-	@make -f $(TOPDIR)/include/fuzz.mk EFI_INCLUDES="$(EFI_INCLUDES)" ARCH_DEFINES="$(ARCH_DEFINES)" clean
+	@find . -type f -a -perm /111 -a -iname 'fuzz-*' -print -delete
 
 clean-test-objs:
-	@make -f $(TOPDIR)/include/test.mk EFI_INCLUDES="$(EFI_INCLUDES)" ARCH_DEFINES="$(ARCH_DEFINES)" clean
+	@find . -type f -a -perm /111 -a -iname 'test-*' -print -delete
 
 .PHONY : $(patsubst %.c,%,$(wildcard fuzz-*.c)) fuzz
 .PHONY : $(patsubst %.c,%,$(wildcard test-*.c)) test
diff --git a/include/fuzz.mk b/include/fuzz.mk
index 44b0776ef..632039604 100644
--- a/include/fuzz.mk
+++ b/include/fuzz.mk
@@ -113,8 +113,7 @@ fuzz : $(fuzzers)
 	$(MAKE) -f include/fuzz.mk fuzz-clean
 
 fuzz-clean :
-	@rm -vf random.bin libefi-test.a
-	@rm -vf vgcore.* fuzz*.log
+	@rm -vf random.bin libefi-test.a $(wildcard *-corpus/fuzz*.log)
 
 clean : fuzz-clean