Index: kernel/test/mm/falloc1.c
===================================================================
--- kernel/test/mm/falloc1.c	(revision 96348adc5fd6e05c187a0b5ada4b3c219815b609)
+++ kernel/test/mm/falloc1.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -47,6 +47,8 @@
 	int i, order, run;
 	int allocated;
-
-	ASSERT(TEST_RUNS > 1);
+	
+	if (TEST_RUNS < 2)
+		return "Test is compiled with TEST_RUNS < 2";
+	
 	if (frames == NULL)
 		return "Unable to allocate frames";
Index: kernel/test/mm/mapping1.c
===================================================================
--- kernel/test/mm/mapping1.c	(revision 96348adc5fd6e05c187a0b5ada4b3c219815b609)
+++ kernel/test/mm/mapping1.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -63,6 +63,8 @@
 	printf("Value at virtual address %p is %#x.\n", PAGE1, v1 = *((uint32_t *) PAGE1));
 	
-	ASSERT(v0 == VALUE0);
-	ASSERT(v1 == VALUE1);
+	if (v0 != VALUE0)
+		return "Value at v0 not equal to VALUE0";
+	if (v1 != VALUE1)
+		return "Value at v1 not equal to VALUE1";
 
 	printf("Writing %#x to virtual address %p.\n", 0, PAGE0);
@@ -77,6 +79,8 @@
 	printf("Value at virtual address %p is %#x.\n", PAGE1, *((uint32_t *) PAGE1));
 
-	ASSERT(v0 == 0);
-	ASSERT(v1 == 0);
+	if (v0 != 0)
+		return "Value at v0 not equal to 0";
+	if (v1 != 0)
+		return "Value at v1 not equal to 0";
 	
 	return NULL;	
Index: kernel/test/mm/slab1.c
===================================================================
--- kernel/test/mm/slab1.c	(revision 96348adc5fd6e05c187a0b5ada4b3c219815b609)
+++ kernel/test/mm/slab1.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -32,5 +32,4 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <panic.h>
 #include <memstr.h>
 
Index: kernel/test/mm/slab2.c
===================================================================
--- kernel/test/mm/slab2.c	(revision 96348adc5fd6e05c187a0b5ada4b3c219815b609)
+++ kernel/test/mm/slab2.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -32,5 +32,4 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <panic.h>
 #include <mm/frame.h>
 #include <memstr.h>
@@ -89,5 +88,6 @@
 		data1 = slab_alloc(cache1, FRAME_ATOMIC);
 		if (!data1) {
-			panic("Incorrect memory size - use another test.");
+			printf("Incorrect memory size - use another test.");
+			return;
 		}
 		memsetb((uintptr_t)data1, ITEM_SIZE, 0);