--- libmalloc/libmalloc-792.41.1/tests/malloc_size_test.c
+++ libmalloc/libmalloc-715.140.5/tests/malloc_size_test.c
@@ -38,8 +38,7 @@
 }
 
 T_DECL(malloc_size_valid, "Test malloc_size() on valid pointers, non-Nano",
-	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_ALL_ALLOCATORS,
-	   T_META_TAG_VM_PREFERRED)
+	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_XZONE, T_META_TAG_VM_NOT_PREFERRED)
 {
 	// Test various sizes, roughly targetting each allocator range.
 	test_malloc_size_valid(2, 256, 16);
@@ -48,15 +47,13 @@
 }
 
 T_DECL(malloc_size_valid_nanov2, "Test malloc_size() on valid pointers for Nanov2",
-	   T_META_ENVVAR("MallocNanoZone=V2"), T_META_TAG_ALL_ALLOCATORS,
-	   T_META_TAG_VM_PREFERRED)
+	   T_META_ENVVAR("MallocNanoZone=V2"), T_META_TAG_XZONE, T_META_TAG_VM_NOT_PREFERRED)
 {
 	test_malloc_size_valid(2, 256, 16);
 }
 
 T_DECL(malloc_size_invalid, "Test malloc_size() on invalid pointers, non-Nano",
-	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_VM_PREFERRED,
-	   T_META_TAG_ALL_ALLOCATORS)
+	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_VM_NOT_PREFERRED)
 {
 	// Test various sizes, roughly targetting each allocator range.
 	test_malloc_size_invalid(2, 256, 16);
@@ -65,8 +62,7 @@
 }
 
 T_DECL(malloc_size_invalid_nanov2, "Test malloc_size() on valid pointers for Nanov2",
-	   T_META_ENVVAR("MallocNanoZone=V2"), T_META_TAG_VM_PREFERRED,
-	   T_META_TAG_ALL_ALLOCATORS)
+	   T_META_ENVVAR("MallocNanoZone=V2"), T_META_TAG_VM_NOT_PREFERRED)
 {
 	test_malloc_size_invalid(2, 256, 16);
 }
@@ -77,7 +73,8 @@
 #if !MALLOC_TARGET_EXCLAVES
 T_DECL(malloc_size_invalid_xzone,
 		"Test malloc_size() on invalid pointers for xzone",
-		T_META_TAG_XZONE_ONLY, T_META_TAG_VM_PREFERRED)
+		T_META_TAG_XZONE_ONLY,
+	    T_META_TAG_VM_NOT_PREFERRED)
 {
 	// Exhaust early budget
 	void *ptr = NULL;
@@ -132,7 +129,7 @@
 
 #if TARGET_OS_OSX
 T_DECL(malloc_size_large_allocation, "Test malloc_size() on buffers > 4GB",
-		T_META_TAG_ALL_ALLOCATORS, T_META_TAG_VM_PREFERRED)
+		T_META_TAG_XZONE, T_META_TAG_VM_NOT_PREFERRED)
 {
 	void *ptr = malloc(GiB(4));
 	T_ASSERT_NOTNULL(ptr, "4GB allocation");
@@ -148,7 +145,7 @@
 
 T_DECL(malloc_size_multi_segment,
 		"Make a multi-segment allocation, and pass inner pointers to malloc_size",
-		T_META_TAG_XZONE_ONLY, T_META_TAG_VM_PREFERRED)
+		T_META_TAG_XZONE_ONLY, T_META_TAG_VM_NOT_ELIGIBLE)
 {
 	void *ptr = malloc(MiB(12));
 	T_ASSERT_NOTNULL(ptr, "HUGE allocation");
@@ -164,7 +161,7 @@
 #if TARGET_OS_OSX
 T_DECL(malloc_size_outside_embedded_space,
 		"Make enough allocations to push address space beyond 64GB",
-		T_META_TAG_XZONE_ONLY, T_META_TAG_VM_PREFERRED)
+		T_META_TAG_XZONE_ONLY, T_META_TAG_VM_NOT_ELIGIBLE)
 {
 	// Make 32 2GB allocations (don't fault them to avoid dirty memory) to
 	// exhaust the embedded/low segment table address space
@@ -193,7 +190,7 @@
 #endif // TARGET_OS_OSX
 
 T_DECL(malloc_size_max_good_size, "Check malloc_good_size(SIZE_MAX)",
-		T_META_TAG_ALL_ALLOCATORS, T_META_TAG_VM_PREFERRED,
+		T_META_TAG_XZONE, T_META_TAG_NANO_ON_XZONE,
 		T_META_ENVVAR("MallocNanoZone=1"))
 {
 	size_t request_size = SIZE_MAX - 5;