--- libmalloc/libmalloc-283.100.6/tests/Makefile
+++ libmalloc/libmalloc-409.40.6/tests/Makefile
@@ -30,6 +30,7 @@
 OTHER_CFLAGS += \
 	-DDARWINTEST \
 	-DOS_UNFAIR_LOCK_INLINE=1 \
+	-fno-builtin \
 	-lCrashReporterClient \
 	-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders \
 	-I$(SRCROOT)/../private \
@@ -44,6 +45,7 @@
 		$(CFLAGS) $(DT_CFLAGS) $(OTHER_CFLAGS) \
 		$(LDFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) \
 		-DTRACE_NAME="$(patsubst nano-trace-replay_%,%,$(notdir $@))" \
+		$(patsubst _Photos_puja,-DTEST_TIMEOUT=3000,$(findstring _Photos_puja,$(notdir $@))) \
 		-o $@ \
 		$(SRCROOT)/nano_trace_replay.c
 
@@ -58,11 +60,13 @@
 BATS_PLISTS = $(BATS_PLISTS_EXTRACT)
 endif
 
+BATS_PLISTS += $(PROJECT_DIR)/tests/xctests/BATS.plist
+
 $(BATS_PLISTS_EXTRACT): %.plist : %
 	$(EXTRACTMETA) extract -i /$(INSTALLPATH)/$(notdir $<) -b $(SYMROOT)/$(notdir $<) -o $@
 	@plutil -convert binary1 $@
 
-SANITIZER_DYLIB_PATH := /usr/local/lib/sanitizers/
+SANITIZER_DYLIB_PATH := /usr/appleinternal/lib/sanitizers/
 asan: OTHER_CFLAGS += -fsanitize=address
 asan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
 
@@ -70,7 +74,7 @@
 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
+EXCLUDED_SOURCES += tsan.c magazine_medium_test.c
 endif
 
 madvise: OTHER_CFLAGS += -I../src