--- libmalloc/libmalloc-140.50.6/tests/Makefile
+++ libmalloc/libmalloc-116.30.3/tests/Makefile
@@ -5,16 +5,9 @@
 
 include $(DEVELOPER_DIR)/AppleInternal/Makefiles/darwintest/Makefile.common
 
+OTHER_CFLAGS += -DDARWINTEST
 MALLOCBENCH_SOURCE := $(wildcard MallocBench/*.cpp)
-EXCLUDED_SOURCES := MallocBench.cpp
 CXX := $(shell $(XCRUN) -sdk "$(TARGETSDK)" -find clang++)
-
-OTHER_CFLAGS += \
-	-DDARWINTEST \
-	-DOS_UNFAIR_LOCK_INLINE=1 \
-	-lCrashReporterClient \
-	-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders \
-	-I$(SRCROOT)/../include/malloc
 
 $(OBJROOT)/MallocBench/%.o: MallocBench/%.cpp
 	@mkdir -p $(OBJROOT)/MallocBench
@@ -65,21 +58,13 @@
 #	parallel-medium \
 #	parallel-big
 
-SANITIZER_DYLIB_PATH := /usr/local/lib/sanitizers/
+ifeq ($(Embedded),YES)
+EXCLUDED_SOURCES += asan
+else
+CLANG_LIB_DIR := $(dir $(shell xcrun -f clang --sdk $(SDKROOT)))../lib
+ASAN_DYLIB_PATH := $(dir $(subst /BuildRoot,,$(shell find $(CLANG_LIB_DIR) -name libclang_rt.asan_osx_dynamic.dylib -perm -0111 | head -n 1)))
 asan: OTHER_CFLAGS += -fsanitize=address
-asan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
-
-ifeq ($(Embedded),NO)
-tsan: CFLAGS := $(filter-out $(ARCH_FLAGS),$(CFLAGS)) -arch x86_64 -fsanitize=thread
-tsan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
-else
-EXCLUDED_SOURCES += tsan.c
+asan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(ASAN_DYLIB_PATH)
 endif
 
-madvise: OTHER_CFLAGS += -I../src
-stack_logging_test: OTHER_CFLAGS += -I../private
-radix_tree_test: OTHER_CFLAGS += -I../src -framework Foundation
-
-.DEFAULT_GOAL := all
-
 include $(DEVELOPER_DIR)/AppleInternal/Makefiles/darwintest/Makefile.targets