--- libmalloc/libmalloc-166.220.1/tests/malloc_claimed_address_tests.c
+++ libmalloc/libmalloc-792.60.6/tests/malloc_claimed_address_tests.c
@@ -8,15 +8,21 @@
 #include <darwintest.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <mach/mach.h>
-#include <mach/mach_vm.h>
-#include <malloc.h>
 #include <malloc/malloc.h>
 #include <malloc_private.h>
 #include <sys/mman.h>
+#include "base.h"
+
+#if !MALLOC_TARGET_EXCLAVES
+#include <mach/mach.h>
+#include <mach/mach_vm.h>
+#endif // !MALLOC_TARGET_EXCLAVES
+
+T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true));
 
 T_DECL(malloc_claimed_address_default_zone_test,
 		"Tests for malloc_claimed_address, default zone only",
+		T_META_TAG_ALL_ALLOCATORS, T_META_TAG_VM_PREFERRED,
 		T_META_ENVVAR("MallocNanoZone=0"))
 {
 	// NULL is never a possible pointer.
@@ -53,6 +59,7 @@
 	T_EXPECT_TRUE(result, "allocation from large with offset");
 	free(ptr);
 
+#if !MALLOC_TARGET_EXCLAVES
 	// Allocate some memory with vm_allocate() and make sure it's not claimed.
 	mach_vm_address_t addr;
 	kern_return_t kr = mach_vm_allocate(mach_task_self(), &addr, 1024, VM_FLAGS_ANYWHERE);
@@ -60,12 +67,17 @@
 	result = malloc_claimed_address((void *)addr);
 	T_EXPECT_FALSE(result, "address in VM allocated memory");
 	mach_vm_deallocate(mach_task_self(), addr, 1024);
-}
-
-
+#endif // !MALLOC_TARGET_EXCLAVES
+}
+
+
+#if !MALLOC_TARGET_EXCLAVES
+// Don't test on xzones because non-default xzones can claim allocations
+// from the main zone
 T_DECL(malloc_zone_claimed_address_test,
 		"Tests for malloc_zone_claimed_address",
-		T_META_ENVVAR("MallocNanoZone=0"))
+		T_META_ENVVAR("MallocNanoZone=0"),
+		T_META_TAG_MAGAZINE_ONLY, T_META_TAG_VM_PREFERRED)
 {
 	malloc_zone_t *zone = malloc_create_zone(0, 0);
 
@@ -137,10 +149,14 @@
 
 	malloc_destroy_zone(zone);
 }
-
+#endif // !MALLOC_TARGET_EXCLAVES
+
+#if !MALLOC_TARGET_EXCLAVES
 T_DECL(malloc_claimed_address_zone_test,
 		"Tests for malloc_claimed_address with another zone",
-		T_META_ENVVAR("MallocNanoZone=0"))
+		T_META_TAG_ALL_ALLOCATORS,
+		T_META_ENVVAR("MallocNanoZone=0"),
+	    T_META_TAG_VM_PREFERRED)
 {
 	// Allocate in a custom zone, check that we can still use
 	// malloc_claimed_address() to check whether an address is claimed.
@@ -178,10 +194,12 @@
 
 	malloc_destroy_zone(zone);
 }
+#endif // !MALLOC_TARGET_EXCLAVES
 
 T_DECL(malloc_claimed_address_nanozone_test,
 		"Tests for malloc_claimed_address with nano",
-		T_META_ENVVAR("MallocNanoZone=1"))
+		T_META_ENVVAR("MallocNanoZone=1"),
+	    T_META_TAG_VM_PREFERRED, T_META_TAG_MAGAZINE_ONLY)
 {
 	// NULL is never a possible pointer.
 	boolean_t result = malloc_claimed_address(NULL);
@@ -198,6 +216,17 @@
 		free(ptr);
 	}
 
+	// Allocate a non-Nano size, which Nano will pass to its helper zone.
+	// Verify that it still claims the address as valid when asked via the
+	// default zone.
+	void *ptr = malloc(512);
+	result = malloc_claimed_address(ptr);
+	T_EXPECT_TRUE(result, "Above nano pointer check");
+	result = malloc_zone_claimed_address(malloc_default_zone(), ptr);
+	T_EXPECT_TRUE(result, "Above nano pointer check via default zone");
+	free(ptr);
+
+#if !MALLOC_TARGET_EXCLAVES
 	// Allocate some memory with vm_allocate() and make sure it's not claimed.
 	mach_vm_address_t addr;
 	kern_return_t kr = mach_vm_allocate(mach_task_self(), &addr, 1024, VM_FLAGS_ANYWHERE);
@@ -205,12 +234,16 @@
 	result = malloc_claimed_address((void *)addr);
 	T_EXPECT_FALSE(result, "address in VM allocated memory");
 	mach_vm_deallocate(mach_task_self(), addr, 1024);
-}
-
-
+#endif // !MALLOC_TARGET_EXCLAVES
+}
+
+#if !MALLOC_TARGET_EXCLAVES
+// Don't run this test on xzone malloc, since the test assumes that it's safe
+// to mprotect the zone returned by malloc_create_zone
 T_DECL(malloc_claimed_address_custom_zone_test,
 		"Tests for malloc_claimed_address in a zone that does not implement it",
-		T_META_ENVVAR("MallocNanoZone=0"))
+		T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_VM_PREFERRED,
+		T_META_TAG_MAGAZINE_ONLY)
 {
 	// Custom zones that do not support claimed_address must always appear
 	// to return true.
@@ -256,4 +289,17 @@
 
 	malloc_destroy_zone(zone);
 }
-
+#endif // !MALLOC_TARGET_EXCLAVES
+
+T_DECL(malloc_claimed_address_xzone_test,
+		"Specific xzone malloc tests for malloc_claimed_address",
+		T_META_TAG_XZONE_ONLY, T_META_TAG_VM_PREFERRED)
+{
+	// Allocate a HUGE buffer, and then check that both the start and end of it
+	// are claimed by malloc
+	void *ptr = malloc(MiB(6));
+	T_EXPECT_TRUE(malloc_claimed_address(ptr), "start of HUGE allocation");
+	T_EXPECT_TRUE(malloc_claimed_address(ptr + MiB(6) - 1),
+			"end of HUGE allocation");
+	free(ptr);
+}