Index: kernel/test/cht/cht1.c
===================================================================
--- kernel/test/cht/cht1.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/test/cht/cht1.c	(revision 99013b8491c3ead5fcc0e38eaf819467043c5947)
@@ -110,5 +110,5 @@
 
 	for (int i = 0; i < val_cnt; ++i)
-		v[i] = malloc(sizeof(val_t), 0);
+		v[i] = nfmalloc(sizeof(val_t));
 
 	size_t key[] = { 1, 1, 1, 11, 12, 13 };
@@ -316,5 +316,5 @@
 		TPRINTF("I{");
 		for (size_t i = 0; i < work->wave_elems; ++i) {
-			stress_t *s = malloc(sizeof(stress_t), FRAME_ATOMIC);
+			stress_t *s = malloc(sizeof(stress_t));
 			if (!s) {
 				TPRINTF("[out-of-mem]\n");
@@ -473,5 +473,5 @@
 
 	TPRINTF("Alloc and init table items. \n");
-	void *p = malloc(size, FRAME_ATOMIC);
+	void *p = malloc(size);
 	if (!p) {
 		TPRINTF("Failed to alloc items\n");
Index: kernel/test/mm/falloc1.c
===================================================================
--- kernel/test/mm/falloc1.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/test/mm/falloc1.c	(revision 99013b8491c3ead5fcc0e38eaf819467043c5947)
@@ -47,5 +47,5 @@
 
 	uintptr_t *frames = (uintptr_t *)
-	    malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
+	    malloc(MAX_FRAMES * sizeof(uintptr_t));
 	if (frames == NULL)
 		return "Unable to allocate frames";
Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/test/mm/falloc2.c	(revision 99013b8491c3ead5fcc0e38eaf819467043c5947)
@@ -53,5 +53,5 @@
 
 	uintptr_t *frames = (uintptr_t *)
-	    malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
+	    malloc(MAX_FRAMES * sizeof(uintptr_t));
 	if (frames == NULL) {
 		TPRINTF("Thread #%" PRIu64 " (cpu%u): "
Index: kernel/test/synch/rcu1.c
===================================================================
--- kernel/test/synch/rcu1.c	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/test/synch/rcu1.c	(revision 99013b8491c3ead5fcc0e38eaf819467043c5947)
@@ -251,6 +251,6 @@
 {
 	for (int i = 0; i < nop_updater_iters; i += 2) {
-		rcu_item_t *a = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
-		rcu_item_t *b = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
+		rcu_item_t *a = malloc(sizeof(rcu_item_t));
+		rcu_item_t *b = malloc(sizeof(rcu_item_t));
 
 		if (a && b) {
@@ -315,5 +315,5 @@
 	rcu_read_lock();
 
-	item_w_cookie_t *item = malloc(sizeof(item_w_cookie_t), FRAME_ATOMIC);
+	item_w_cookie_t *item = malloc(sizeof(item_w_cookie_t));
 
 	if (item) {
@@ -420,6 +420,6 @@
 		/* Updater */
 		for (size_t i = 0; i < work->update_cnt; ++i) {
-			seq_item_t *a = malloc(sizeof(seq_item_t), FRAME_ATOMIC);
-			seq_item_t *b = malloc(sizeof(seq_item_t), FRAME_ATOMIC);
+			seq_item_t *a = malloc(sizeof(seq_item_t));
+			seq_item_t *b = malloc(sizeof(seq_item_t));
 
 			if (a && b) {
@@ -523,5 +523,5 @@
 	TPRINTF("\nReader exits thread with rcu_lock\n");
 
-	exited_t *p = malloc(sizeof(exited_t), FRAME_ATOMIC);
+	exited_t *p = malloc(sizeof(exited_t));
 	if (!p) {
 		TPRINTF("[out-of-mem]\n");
@@ -686,5 +686,5 @@
 static bool do_one_reader_preempt(void (*f)(void *), const char *err)
 {
-	preempt_t *p = malloc(sizeof(preempt_t), FRAME_ATOMIC);
+	preempt_t *p = malloc(sizeof(preempt_t));
 	if (!p) {
 		TPRINTF("[out-of-mem]\n");
@@ -777,5 +777,5 @@
 	TPRINTF("\nSynchronize with long reader\n");
 
-	synch_t *synch = malloc(sizeof(synch_t), FRAME_ATOMIC);
+	synch_t *synch = malloc(sizeof(synch_t));
 
 	if (!synch) {
@@ -828,5 +828,5 @@
 	TPRINTF("\nrcu_barrier: Wait for outstanding rcu callbacks to complete\n");
 
-	barrier_t *barrier = malloc(sizeof(barrier_t), FRAME_ATOMIC);
+	barrier_t *barrier = malloc(sizeof(barrier_t));
 
 	if (!barrier) {
@@ -886,5 +886,5 @@
 
 	for (size_t i = 0; i < s->iters; ++i) {
-		rcu_item_t *item = malloc(sizeof(rcu_item_t), FRAME_ATOMIC);
+		rcu_item_t *item = malloc(sizeof(rcu_item_t));
 
 		if (item) {
Index: kernel/test/synch/workq-test-core.h
===================================================================
--- kernel/test/synch/workq-test-core.h	(revision 7473807b2cbcf501c8b807c52295d1ef0e1e9f37)
+++ kernel/test/synch/workq-test-core.h	(revision 99013b8491c3ead5fcc0e38eaf819467043c5947)
@@ -72,5 +72,5 @@
 static test_work_t *create_child(test_work_t *work)
 {
-	test_work_t *child = malloc(sizeof(test_work_t), 0);
+	test_work_t *child = nfmalloc(sizeof(test_work_t));
 	assert(child);
 	if (child) {
@@ -152,5 +152,5 @@
 	}
 
-	test_work_t *work = malloc(sizeof(test_work_t), 0);
+	test_work_t *work = nfmalloc(sizeof(test_work_t));
 
 	work->master = true;