--- libmalloc/libmalloc-521.120.7/tests/scribble_tests.c
+++ libmalloc/libmalloc-792.60.6/tests/scribble_tests.c
@@ -27,8 +27,10 @@
 
 // note that scribble seems to break leaks for szone malloc
 T_DECL(malloc_scribble_check, "check MallocScribble works",
-	T_META_TAG_XZONE,
+	T_META_TAG_ALL_ALLOCATORS,
+	T_META_TAG_VM_PREFERRED,
 	T_META_ENVVAR("MallocScribble=1"),
+	T_META_ENVVAR("MallocProbGuard=0"),  // rdar://121458833
 	T_META_CHECK_LEAKS(false))
 {
 	// Ensure that TINY allocations are scribbled on allocation
@@ -104,17 +106,18 @@
 		free(ptr);
 	}
 
-	// Make sure memory returned by malloc_zone_malloc_with_options_np() is
+	// Make sure memory returned by malloc_zone_malloc_with_options() is
 	// correct
-	ptr = malloc_zone_malloc_with_options_np(NULL, sizeof(void *), KiB(1), 0);
+	ptr = malloc_zone_malloc_with_options(NULL, MALLOC_ZONE_MALLOC_DEFAULT_ALIGN, KiB(1),
+			MALLOC_ZONE_MALLOC_OPTION_NONE);
 	T_EXPECT_TRUE(memchk(ptr, SCRIBBLE_ALLOC_BYTE, KiB(1)),
-			"malloc_zone_malloc_with_options_np()");
+			"malloc_zone_malloc_with_options()");
 	free(ptr);
 
-	ptr = malloc_zone_malloc_with_options_np(NULL, sizeof(void *), KiB(1),
-			MALLOC_NP_OPTION_CLEAR);
+	ptr = malloc_zone_malloc_with_options(NULL, MALLOC_ZONE_MALLOC_DEFAULT_ALIGN, KiB(1),
+			MALLOC_ZONE_MALLOC_OPTION_CLEAR);
 	T_EXPECT_TRUE(memchk(ptr, 0, KiB(1)),
-			"malloc_zone_malloc_with_options_np(MALLOC_NP_OPTION_CLEAR)");
+			"malloc_zone_malloc_with_options(MALLOC_ZONE_MALLOC_OPTION_CLEAR)");
 	free(ptr);
 
 	// Allocate and free many allocations smaller than the zero on free