Index: kernel/test/mm/falloc1.c
===================================================================
--- kernel/test/mm/falloc1.c	(revision 5df19638ae7b362a07b4f8c7b1647a3adcb53862)
+++ kernel/test/mm/falloc1.c	(revision adb252c05c31f972191e419e5f45bbb4c5e6fa17)
@@ -62,10 +62,8 @@
 			unsigned int allocated = 0;
 			for (unsigned int i = 0; i < (MAX_FRAMES / count); i++) {
-				frames[allocated] =
-				    PA2KA(frame_alloc(count, FRAME_ATOMIC, 0));
-				
-				if (frames[allocated])
+				frames[allocated] = frame_alloc(count, FRAME_ATOMIC, 0);
+				if (frames[allocated]) {
 					allocated++;
-				else {
+				} else {
 					TPRINTF("done. ");
 					break;
@@ -84,5 +82,5 @@
 			
 			for (unsigned int i = 0; i < allocated; i++)
-				frame_free(KA2PA(frames[i]), count);
+				frame_free(frames[i], count);
 			
 			TPRINTF("done.\n");
Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision 5df19638ae7b362a07b4f8c7b1647a3adcb53862)
+++ kernel/test/mm/falloc2.c	(revision adb252c05c31f972191e419e5f45bbb4c5e6fa17)
@@ -74,8 +74,7 @@
 			unsigned int allocated = 0;
 			for (unsigned int i = 0; i < (MAX_FRAMES / count); i++) {
-				frames[allocated] =
-				    PA2KA(frame_alloc(count, FRAME_ATOMIC, 0));
+				frames[allocated] = frame_alloc(count, FRAME_ATOMIC, 0);
 				if (frames[allocated]) {
-					memsetb((void *) frames[allocated], bytes, val);
+					memsetb((void *) PA2KA(frames[allocated]), bytes, val);
 					allocated++;
 				} else
@@ -91,8 +90,8 @@
 			for (unsigned int i = 0; i < allocated; i++) {
 				for (size_t k = 0; k < bytes; k++) {
-					if (((uint8_t *) frames[i])[k] != val) {
+					if (((uint8_t *) PA2KA(frames[i]))[k] != val) {
 						TPRINTF("Thread #%" PRIu64 " (cpu%u): "
 						    "Unexpected data (%c) in block %zu offset %zu\n",
-						    THREAD->tid, CPU->id, ((char *) frames[i])[k],
+						    THREAD->tid, CPU->id, ((char *) PA2KA(frames[i]))[k],
 						    frames[i], k);
 						atomic_inc(&thread_fail);
@@ -100,5 +99,5 @@
 					}
 				}
-				frame_free(KA2PA(frames[i]), count);
+				frame_free(frames[i], count);
 			}