@@ -32,12 +32,12 @@
 	OFRange range;
 
 	TEST(@"+[dataWithItemSize:]",
 	    (mutable = [OFMutableData dataWithItemSize: 4096]))
 
-	raw[0] = of_alloc(1, 4096);
-	raw[1] = of_alloc(1, 4096);
+	raw[0] = OFAllocMemory(1, 4096);
+	raw[1] = OFAllocMemory(1, 4096);
 	memset(raw[0], 0xFF, 4096);
 	memset(raw[1], 0x42, 4096);
 
 	TEST(@"-[addItem:]", R([mutable addItem: raw[0]]) &&
 	    R([mutable addItem: raw[1]]))
@@ -216,11 +216,11 @@
 
 	EXPECT_EXCEPTION(@"Detect out of range in -[removeItemsInRange:]",
 	    OFOutOfRangeException,
 	    [mutable removeItemsInRange: OFRangeMake(mutable.count, 1)])
 
-	free(raw[0]);
-	free(raw[1]);
+	OFFreeMemory(raw[0]);
+	OFFreeMemory(raw[1]);
 
 	objc_autoreleasePoolPop(pool);
 }
 @end