--- libmalloc/libmalloc-792.80.2/tests/madvise.c
+++ libmalloc/libmalloc-374.60.3/tests/madvise.c
@@ -10,6 +10,9 @@
 #include "platform.h"
 #include "nano_zone_common.h"
 #include "nano_zone.h"
+
+extern int
+malloc_engaged_nano(void);
 
 #define T_EXPECT_BYTES(p, len, byte, msg, ...) do { \
 	char *_p = (char *)(p); \
@@ -26,8 +29,7 @@
 // madvise behaviour predictable under test.
 T_DECL(madvise_free_debug, "test vm.madvise_free_debug",
 	   T_META_SYSCTL_INT("vm.madvise_free_debug=1"),
-	   T_META_ASROOT(YES), T_META_TAG_VM_NOT_PREFERRED,
-	   T_META_TAG_NO_ALLOCATOR_OVERRIDE)
+	   T_META_ASROOT(YES))
 {
 	// Map 32k of memory.
 	size_t memsz = 32 * vm_page_size;
@@ -49,8 +51,7 @@
 
 T_DECL(subpage_madvise_free_debug, "test vm.madvise_free_debug",
 	   T_META_SYSCTL_INT("vm.madvise_free_debug=1"),
-	   T_META_ASROOT(YES), T_META_TAG_NO_ALLOCATOR_OVERRIDE,
-	   T_META_TAG_VM_NOT_PREFERRED)
+	   T_META_ASROOT(YES))
 {
 	// Skip if we dont' have vm_kernel_page_size < vm_page_size
 	if (vm_kernel_page_size >= vm_page_size) {
@@ -351,8 +352,6 @@
 }
 
 T_DECL(tiny_aggressive_madvise, "tiny allocator free with MallocAggressiveMadvise=1",
-	   T_META_TAG_MAGAZINE_ONLY,
-	   T_META_TAG_VM_NOT_PREFERRED,
 	   T_META_SYSCTL_INT("vm.madvise_free_debug=1"),
 	   T_META_ENVVAR("MallocNanoZone=0"),
 	   T_META_ENVVAR("MallocAggressiveMadvise=1"),
@@ -365,8 +364,6 @@
 T_DECL(small_aggressive_madvise, "small allocator free with MallocAggressiveMadvise=1",
 	   T_META_SYSCTL_INT("vm.madvise_free_debug=1"),
 	   T_META_ENVVAR("MallocAggressiveMadvise=1"),
-	   T_META_TAG_MAGAZINE_ONLY,
-	   T_META_TAG_VM_NOT_PREFERRED,
 	   T_META_ENABLED(CONFIG_AGGRESSIVE_MADVISE),
 	   T_META_ASROOT(YES))
 {
@@ -380,9 +377,7 @@
 	   T_META_ENVVAR("MallocAggressiveMadvise=1"),
 	   T_META_ENABLED(CONFIG_MEDIUM_ALLOCATOR),
 	   T_META_ENABLED(CONFIG_AGGRESSIVE_MADVISE),
-	   T_META_ASROOT(YES),
-	   T_META_TAG_MAGAZINE_ONLY,
-	   T_META_TAG_VM_NOT_PREFERRED)
+	   T_META_ASROOT(YES))
 {
 	test_aggressive_madvise(16 * 64 * 1024, 64 * 1024);
 }