diff --git a/fuzz/Makefile b/tests/fuzz/Makefile
similarity index 98%
rename from fuzz/Makefile
rename to tests/fuzz/Makefile
index 9b084fd3..da22ed0d 100644
--- a/fuzz/Makefile
+++ b/tests/fuzz/Makefile
@@ -12,8 +12,8 @@
 CFLAGS ?= -O3
 CXXFLAGS ?= -O3
 
-ZSTDDIR = ../lib
-PRGDIR = ../programs
+ZSTDDIR = ../../lib
+PRGDIR = ../../programs
 
 FUZZ_CPPFLAGS := -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \
 	-I$(ZSTDDIR)/dictBuilder -I$(ZSTDDIR)/deprecated -I$(PRGDIR) \
diff --git a/fuzz/README.md b/tests/fuzz/README.md
similarity index 100%
rename from fuzz/README.md
rename to tests/fuzz/README.md
diff --git a/fuzz/fuzz.h b/tests/fuzz/fuzz.h
similarity index 100%
rename from fuzz/fuzz.h
rename to tests/fuzz/fuzz.h
diff --git a/fuzz/fuzz_helpers.h b/tests/fuzz/fuzz_helpers.h
similarity index 100%
rename from fuzz/fuzz_helpers.h
rename to tests/fuzz/fuzz_helpers.h
diff --git a/fuzz/regression_driver.c b/tests/fuzz/regression_driver.c
similarity index 100%
rename from fuzz/regression_driver.c
rename to tests/fuzz/regression_driver.c
diff --git a/fuzz/simple_decompress.c b/tests/fuzz/simple_decompress.c
similarity index 100%
rename from fuzz/simple_decompress.c
rename to tests/fuzz/simple_decompress.c
diff --git a/fuzz/simple_round_trip.c b/tests/fuzz/simple_round_trip.c
similarity index 100%
rename from fuzz/simple_round_trip.c
rename to tests/fuzz/simple_round_trip.c
diff --git a/fuzz/stream_decompress.c b/tests/fuzz/stream_decompress.c
similarity index 100%
rename from fuzz/stream_decompress.c
rename to tests/fuzz/stream_decompress.c
diff --git a/fuzz/stream_round_trip.c b/tests/fuzz/stream_round_trip.c
similarity index 100%
rename from fuzz/stream_round_trip.c
rename to tests/fuzz/stream_round_trip.c