--- libmalloc/libmalloc-283.40.1/tests/malloc_size_test.c
+++ libmalloc/libmalloc-474.0.13/tests/malloc_size_test.c
@@ -17,7 +17,8 @@
 	for (size_t sz = min; sz <= max; sz += incr) {
 		void *ptr = malloc(sz);
 		T_ASSERT_NOTNULL(ptr, "Allocate size %llu\n", (uint64_t)sz);
-		T_ASSERT_GE(malloc_size(ptr), malloc_good_size(sz), "Check size value");
+		T_ASSERT_GE(malloc_size(ptr), sz, "Check size value");
+		T_ASSERT_GE(malloc_good_size(sz), sz, "Check good size value");
 		free(ptr);
 	}
 }
@@ -35,7 +36,7 @@
 }
 
 T_DECL(malloc_size_valid, "Test malloc_size() on valid pointers, non-Nano",
-	   T_META_ENVVAR("MallocNanoZone=0"))
+	   T_META_ENVVAR("MallocNanoZone=0"), T_META_TAG_XZONE)
 {
 	// Test various sizes, roughly targetting each allocator range.
 	test_malloc_size_valid(2, 256, 16);
@@ -43,14 +44,8 @@
 	test_malloc_size_valid(8192, 65536, 1024);
 }
 
-T_DECL(malloc_size_valid_nanov1, "Test malloc_size() on valid pointers for Nanov1",
-	   T_META_ENVVAR("MallocNanoZone=V1"))
-{
-	test_malloc_size_valid(2, 256, 16);
-}
-
 T_DECL(malloc_size_valid_nanov2, "Test malloc_size() on valid pointers for Nanov2",
-	   T_META_ENVVAR("MallocNanoZone=V2"))
+	   T_META_ENVVAR("MallocNanoZone=V2"), T_META_TAG_XZONE)
 {
 	test_malloc_size_valid(2, 256, 16);
 }
@@ -64,12 +59,6 @@
 	test_malloc_size_invalid(8192, 32768, 1024);
 }
 
-T_DECL(malloc_size_invalid_nanov1, "Test malloc_size() on valid pointers for Nanov1",
-	   T_META_ENVVAR("MallocNanoZone=V1"))
-{
-	test_malloc_size_invalid(2, 256, 16);
-}
-
 T_DECL(malloc_size_invalid_nanov2, "Test malloc_size() on valid pointers for Nanov2",
 	   T_META_ENVVAR("MallocNanoZone=V2"))
 {