diff --git a/.gitignore b/.gitignore
index 9917aeca..94d0b0c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,10 @@ examples/temperature_conversion/mqtt_temperature_conversion
 examples/publish/basic-1
 examples/publish/basic-websockets-1
 
+fuzzing/apps/db_dump/db_dump_fuzz_load
+fuzzing/apps/db_dump/db_dump_fuzz_load_client_stats
+fuzzing/apps/db_dump/db_dump_fuzz_load_stats
+fuzzing/apps/mosquitto_passwd/mosquitto_passwd_fuzz_load
 fuzzing/broker/broker_fuzz_initial_packet
 fuzzing/broker/broker_fuzz_initial_packet_with_init
 fuzzing/broker/broker_fuzz_read_handle
@@ -56,7 +60,9 @@ fuzzing/corpora/broker_packet_seed_corpus.zip
 fuzzing/corpora/client/*
 fuzzing/corpora/client_packet_seed_corpus.zip
 fuzzing/corpora/db_dump_seed_corpus.zip
-
+fuzzing/lib/lib_fuzz_pub_topic_check2
+fuzzing/lib/lib_fuzz_sub_topic_check2
+fuzzing/lib/lib_fuzz_utf8
 
 lib/cpp/libmosquittopp.so*
 lib/cpp/libmosquittopp.a
diff --git a/fuzzing/Makefile b/fuzzing/Makefile
index c3c42778..b6b5091a 100644
--- a/fuzzing/Makefile
+++ b/fuzzing/Makefile
@@ -3,16 +3,14 @@
 all:
 	./generate_packet_corpora.py
 	zip -r corpora/db_dump_seed_corpus.zip ../test/apps/db_dump/data/
+	$(MAKE) -C apps $@
 	$(MAKE) -C broker $@
-	$(MAKE) -C db_dump $@
 	$(MAKE) -C lib $@
-	$(MAKE) -C mosquitto_passwd $@
 
 clean:
 	-rm -rf corpora/broker corpora/client
 	-rm -f corpora/broker_packet_seed_corpus.zip corpora/client_packet_seed_corpus.zip
 	-rm -f corpora/db_dump_seed_corpus.zip
+	$(MAKE) -C apps $@
 	$(MAKE) -C broker $@
-	$(MAKE) -C db_dump $@
 	$(MAKE) -C lib $@
-	$(MAKE) -C mosquitto_passwd $@
diff --git a/fuzzing/apps/Makefile b/fuzzing/apps/Makefile
new file mode 100644
index 00000000..fc21282e
--- /dev/null
+++ b/fuzzing/apps/Makefile
@@ -0,0 +1,9 @@
+.PHONY: all clean
+
+all:
+	$(MAKE) -C db_dump $@
+	$(MAKE) -C mosquitto_passwd $@
+
+clean:
+	$(MAKE) -C db_dump $@
+	$(MAKE) -C mosquitto_passwd $@
diff --git a/fuzzing/db_dump/Makefile b/fuzzing/apps/db_dump/Makefile
similarity index 98%
rename from fuzzing/db_dump/Makefile
rename to fuzzing/apps/db_dump/Makefile
index 5bf901b3..41dded7c 100644
--- a/fuzzing/db_dump/Makefile
+++ b/fuzzing/apps/db_dump/Makefile
@@ -1,4 +1,4 @@
-R=../..
+R=../../..
 .PHONY: all clean
 
 FUZZERS:= \
diff --git a/fuzzing/db_dump/db_dump_fuzz_load.cpp b/fuzzing/apps/db_dump/db_dump_fuzz_load.cpp
similarity index 100%
rename from fuzzing/db_dump/db_dump_fuzz_load.cpp
rename to fuzzing/apps/db_dump/db_dump_fuzz_load.cpp
diff --git a/fuzzing/db_dump/db_dump_fuzz_load_client_stats.cpp b/fuzzing/apps/db_dump/db_dump_fuzz_load_client_stats.cpp
similarity index 100%
rename from fuzzing/db_dump/db_dump_fuzz_load_client_stats.cpp
rename to fuzzing/apps/db_dump/db_dump_fuzz_load_client_stats.cpp
diff --git a/fuzzing/db_dump/db_dump_fuzz_load_stats.cpp b/fuzzing/apps/db_dump/db_dump_fuzz_load_stats.cpp
similarity index 100%
rename from fuzzing/db_dump/db_dump_fuzz_load_stats.cpp
rename to fuzzing/apps/db_dump/db_dump_fuzz_load_stats.cpp
diff --git a/fuzzing/mosquitto_passwd/Makefile b/fuzzing/apps/mosquitto_passwd/Makefile
similarity index 90%
rename from fuzzing/mosquitto_passwd/Makefile
rename to fuzzing/apps/mosquitto_passwd/Makefile
index 4c88c8f7..e7306f77 100644
--- a/fuzzing/mosquitto_passwd/Makefile
+++ b/fuzzing/apps/mosquitto_passwd/Makefile
@@ -1,4 +1,4 @@
-R=../..
+R=../../..
 .PHONY: all clean
 
 FUZZERS:= \
@@ -7,7 +7,7 @@ FUZZERS:= \
 LOCAL_CPPFLAGS:=$(CPPFLAGS)
 LOCAL_CXXFLAGS:=$(CXXFLAGS) -g -Wall -Werror -pthread
 LOCAL_LDFLAGS:=$(LDFLAGS)
-LOCAL_LIBADD:=$(LIBADD) $(LIB_FUZZING_ENGINE) ${R}/apps/mosquitto_passwd/mosquittopasswd.a
+LOCAL_LIBADD:=$(LIBADD) $(LIB_FUZZING_ENGINE) ${R}/apps/mosquitto_passwd/mosquitto_passwd.a -lssl -lcrypto
 
 all: $(FUZZERS)
 
diff --git a/fuzzing/mosquitto_passwd/mosquitto_passwd_fuzz_load.cpp b/fuzzing/apps/mosquitto_passwd/mosquitto_passwd_fuzz_load.cpp
similarity index 100%
rename from fuzzing/mosquitto_passwd/mosquitto_passwd_fuzz_load.cpp
rename to fuzzing/apps/mosquitto_passwd/mosquitto_passwd_fuzz_load.cpp