--- libmalloc/libmalloc-646.40.3/tests/aligned_alloc_test.c
+++ libmalloc/libmalloc-792.41.1/tests/aligned_alloc_test.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true), T_META_TAG_XZONE);
+T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true), T_META_TAG_ALL_ALLOCATORS);
 
 static inline void*
 t_aligned_alloc(size_t alignment, size_t size)
@@ -33,9 +33,9 @@
 }
 
 T_DECL(aligned_alloc_free, "aligned_alloc all power of two alignments <= 64kb",
-		T_META_TAG_VM_NOT_PREFERRED)
+		T_META_TAG_VM_PREFERRED)
 {
-#if TARGET_OS_WATCH
+#if TARGET_OS_WATCH && !defined(__LP64__)
 	const size_t max_alignment = 4096;
 #else
 	const size_t max_alignment = 64 * 1024;
@@ -75,6 +75,8 @@
 T_DECL(aligned_alloc_alignment_not_power_of_two, "aligned_alloc should set errno to EINVAL if alignment is not a power of two (implementation constraint)",
 		T_META_TAG_VM_PREFERRED)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-power-of-two-alignment"
 	{
 		void *ptr = aligned_alloc(24, 48); // alignment is even, but not a power of two
 		T_QUIET; T_ASSERT_NULL(ptr, "ptr should be null");
@@ -86,13 +88,17 @@
 		T_QUIET; T_ASSERT_NULL(ptr, "ptr should be null");
 		T_QUIET; T_ASSERT_EQ(errno, EINVAL, "errno should be EINVAL");
 	}
+#pragma GCC diagnostic pop
 }
 
 T_DECL(aligned_alloc_alignment_not_a_multiple_of_voidstar, "aligned_alloc should set errno to EINVAL if alignment is not a multiple of sizeof(void*) (implementation constraint)",
 		T_META_TAG_VM_PREFERRED)
 {
 	const size_t alignment = sizeof(void*)+1;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-power-of-two-alignment"
 	void *ptr = aligned_alloc(alignment, alignment * 2);
+#pragma GCC diagnostic pop
 	T_QUIET; T_ASSERT_NULL(ptr, "ptr should be null");
 	T_QUIET; T_ASSERT_EQ(errno, EINVAL, "aligned_alloc should set errno to EINVAL");
 }