diff --git a/CMakeLists.txt b/CMakeLists.txt
index eade7f31..900fcfff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -611,20 +611,19 @@ endif()
 # Build fuzz tests
 # -----------------------------------------------------------------------------
 if(DEFINED ENV{LIB_FUZZING_ENGINE})
-    set(FUZZING_ENGINE $ENV{LIB_FUZZING_ENGINE})
-    set(FUZZING_COMPILE_FLAGS "")
-    set(FUZZING_LINK_FLAGS "${FUZZING_ENGINE}")
+  set(FUZZING_ENGINE $ENV{LIB_FUZZING_ENGINE})
+  set(FUZZING_COMPILE_FLAGS "")
+  set(FUZZING_LINK_FLAGS "${FUZZING_ENGINE}")
 else()
-    set(FUZZING_COMPILE_FLAGS "-fsanitize=fuzzer,address")
-    set(FUZZING_LINK_FLAGS "-fsanitize=fuzzer,address")
+  set(FUZZING_COMPILE_FLAGS "-fsanitize=fuzzer,address")
+  set(FUZZING_LINK_FLAGS "-fsanitize=fuzzer,address")
 endif()
 
-if('${CMAKE_CXX_COMPILER_ID}' STREQUAL 'Clang')
+if(('${CMAKE_CXX_COMPILER_ID}' STREQUAL 'Clang') AND NOT MI_DEBUG_TSAN)
   ## fuzz testing
-  add_executable(fuzz-random-alloc  test/fuzz-random-alloc.c)
-  target_link_libraries(fuzz-random-alloc PUBLIC mimalloc)
-  set_target_properties(fuzz-random-alloc PROPERTIES
-     COMPILE_FLAGS "${FUZZING_COMPILE_FLAGS}"
-     LINK_FLAGS "${FUZZING_LINK_FLAGS}"
-  )
+  add_executable(mimalloc-test-fuzz  test/test-fuzz.c)
+  target_compile_definitions(mimalloc-test-fuzz PRIVATE ${mi_defines})
+  target_compile_options(mimalloc-test-fuzz PRIVATE ${mi_cflags} "${FUZZING_COMPILE_FLAGS}")
+  target_include_directories(mimalloc-test-fuzz PRIVATE include)
+  target_link_libraries(mimalloc-test-fuzz PRIVATE mimalloc ${mi_libraries} "${FUZZING_LINK_FLAGS}")
 endif()