diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 4cdae78..2350a2e 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -6,3 +6,4 @@
 add_subdirectory(test)
 add_subdirectory(x509)
 add_subdirectory(util)
+add_subdirectory(fuzz)
diff --git a/programs/Makefile b/programs/Makefile
index 2cb7366..228a60e 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -90,9 +90,12 @@
 
 .SILENT:
 
-.PHONY: all clean list
+.PHONY: all clean list fuzz
 
-all: $(APPS)
+all: $(APPS) fuzz
+
+fuzz:
+	$(MAKE) -C fuzz
 
 $(DEP):
 	$(MAKE) -C ../library
@@ -305,6 +308,7 @@
 else
 	del /S /Q /F *.o *.exe
 endif
+	$(MAKE) -C fuzz clean
 
 list:
 	echo $(APPS)
diff --git a/tests/fuzz/.gitignore b/programs/fuzz/.gitignore
similarity index 100%
rename from tests/fuzz/.gitignore
rename to programs/fuzz/.gitignore
diff --git a/tests/fuzz/CMakeLists.txt b/programs/fuzz/CMakeLists.txt
similarity index 100%
rename from tests/fuzz/CMakeLists.txt
rename to programs/fuzz/CMakeLists.txt
diff --git a/tests/fuzz/Makefile b/programs/fuzz/Makefile
similarity index 100%
rename from tests/fuzz/Makefile
rename to programs/fuzz/Makefile
diff --git a/tests/fuzz/README.md b/programs/fuzz/README.md
similarity index 100%
rename from tests/fuzz/README.md
rename to programs/fuzz/README.md
diff --git a/tests/fuzz/common.c b/programs/fuzz/common.c
similarity index 100%
rename from tests/fuzz/common.c
rename to programs/fuzz/common.c
diff --git a/tests/fuzz/common.h b/programs/fuzz/common.h
similarity index 100%
rename from tests/fuzz/common.h
rename to programs/fuzz/common.h
diff --git a/tests/fuzz/corpuses/client b/programs/fuzz/corpuses/client
similarity index 100%
rename from tests/fuzz/corpuses/client
rename to programs/fuzz/corpuses/client
Binary files differ
diff --git a/tests/fuzz/corpuses/dtlsclient b/programs/fuzz/corpuses/dtlsclient
similarity index 100%
rename from tests/fuzz/corpuses/dtlsclient
rename to programs/fuzz/corpuses/dtlsclient
Binary files differ
diff --git a/tests/fuzz/corpuses/dtlsserver b/programs/fuzz/corpuses/dtlsserver
similarity index 100%
rename from tests/fuzz/corpuses/dtlsserver
rename to programs/fuzz/corpuses/dtlsserver
Binary files differ
diff --git a/tests/fuzz/corpuses/server b/programs/fuzz/corpuses/server
similarity index 100%
rename from tests/fuzz/corpuses/server
rename to programs/fuzz/corpuses/server
Binary files differ
diff --git a/tests/fuzz/fuzz_client.c b/programs/fuzz/fuzz_client.c
similarity index 100%
rename from tests/fuzz/fuzz_client.c
rename to programs/fuzz/fuzz_client.c
diff --git a/tests/fuzz/fuzz_client.options b/programs/fuzz/fuzz_client.options
similarity index 100%
rename from tests/fuzz/fuzz_client.options
rename to programs/fuzz/fuzz_client.options
diff --git a/tests/fuzz/fuzz_dtlsclient.c b/programs/fuzz/fuzz_dtlsclient.c
similarity index 100%
rename from tests/fuzz/fuzz_dtlsclient.c
rename to programs/fuzz/fuzz_dtlsclient.c
diff --git a/tests/fuzz/fuzz_dtlsclient.options b/programs/fuzz/fuzz_dtlsclient.options
similarity index 100%
rename from tests/fuzz/fuzz_dtlsclient.options
rename to programs/fuzz/fuzz_dtlsclient.options
diff --git a/tests/fuzz/fuzz_dtlsserver.c b/programs/fuzz/fuzz_dtlsserver.c
similarity index 100%
rename from tests/fuzz/fuzz_dtlsserver.c
rename to programs/fuzz/fuzz_dtlsserver.c
diff --git a/tests/fuzz/fuzz_dtlsserver.options b/programs/fuzz/fuzz_dtlsserver.options
similarity index 100%
rename from tests/fuzz/fuzz_dtlsserver.options
rename to programs/fuzz/fuzz_dtlsserver.options
diff --git a/tests/fuzz/fuzz_privkey.c b/programs/fuzz/fuzz_privkey.c
similarity index 100%
rename from tests/fuzz/fuzz_privkey.c
rename to programs/fuzz/fuzz_privkey.c
diff --git a/tests/fuzz/fuzz_privkey.options b/programs/fuzz/fuzz_privkey.options
similarity index 100%
rename from tests/fuzz/fuzz_privkey.options
rename to programs/fuzz/fuzz_privkey.options
diff --git a/tests/fuzz/fuzz_pubkey.c b/programs/fuzz/fuzz_pubkey.c
similarity index 100%
rename from tests/fuzz/fuzz_pubkey.c
rename to programs/fuzz/fuzz_pubkey.c
diff --git a/tests/fuzz/fuzz_pubkey.options b/programs/fuzz/fuzz_pubkey.options
similarity index 100%
rename from tests/fuzz/fuzz_pubkey.options
rename to programs/fuzz/fuzz_pubkey.options
diff --git a/tests/fuzz/fuzz_server.c b/programs/fuzz/fuzz_server.c
similarity index 100%
rename from tests/fuzz/fuzz_server.c
rename to programs/fuzz/fuzz_server.c
diff --git a/tests/fuzz/fuzz_server.options b/programs/fuzz/fuzz_server.options
similarity index 100%
rename from tests/fuzz/fuzz_server.options
rename to programs/fuzz/fuzz_server.options
diff --git a/tests/fuzz/fuzz_x509crl.c b/programs/fuzz/fuzz_x509crl.c
similarity index 100%
rename from tests/fuzz/fuzz_x509crl.c
rename to programs/fuzz/fuzz_x509crl.c
diff --git a/tests/fuzz/fuzz_x509crl.options b/programs/fuzz/fuzz_x509crl.options
similarity index 100%
rename from tests/fuzz/fuzz_x509crl.options
rename to programs/fuzz/fuzz_x509crl.options
diff --git a/tests/fuzz/fuzz_x509crt.c b/programs/fuzz/fuzz_x509crt.c
similarity index 100%
rename from tests/fuzz/fuzz_x509crt.c
rename to programs/fuzz/fuzz_x509crt.c
diff --git a/tests/fuzz/fuzz_x509crt.options b/programs/fuzz/fuzz_x509crt.options
similarity index 100%
rename from tests/fuzz/fuzz_x509crt.options
rename to programs/fuzz/fuzz_x509crt.options
diff --git a/tests/fuzz/fuzz_x509csr.c b/programs/fuzz/fuzz_x509csr.c
similarity index 100%
rename from tests/fuzz/fuzz_x509csr.c
rename to programs/fuzz/fuzz_x509csr.c
diff --git a/tests/fuzz/fuzz_x509csr.options b/programs/fuzz/fuzz_x509csr.options
similarity index 100%
rename from tests/fuzz/fuzz_x509csr.options
rename to programs/fuzz/fuzz_x509csr.options
diff --git a/tests/fuzz/onefile.c b/programs/fuzz/onefile.c
similarity index 100%
rename from tests/fuzz/onefile.c
rename to programs/fuzz/onefile.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d060255..ecf6f34 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -77,5 +77,3 @@
     link_to_source(scripts)
     link_to_source(ssl-opt.sh)
 endif()
-
-add_subdirectory(fuzz)
diff --git a/tests/Makefile b/tests/Makefile
index 2ca0fd6..27ce338 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -112,12 +112,9 @@
 
 .SILENT:
 
-.PHONY: all check test clean fuzz
+.PHONY: all check test clean
 
-all: $(BINARIES) fuzz
-
-fuzz:
-	$(MAKE) -C fuzz
+all: $(BINARIES)
 
 $(DEP):
 	$(MAKE) -C ../library
@@ -164,7 +161,6 @@
 	rmdir /Q /S TESTS
 endif
 endif
-	$(MAKE) -C fuzz clean
 
 # Test suites caught by SKIP_TEST_SUITES are built but not executed.
 check: $(BINARIES)