Index: kernel/test/mm/slab2.c
===================================================================
--- kernel/test/mm/slab2.c	(revision 0f4f1b286ec18fe5bc220bbc629fc26b6813d889)
+++ kernel/test/mm/slab2.c	(revision 9daee3de8f3cc14d8464bd7f7eb8f3ccb749a1fd)
@@ -127,6 +127,6 @@
 
 static slab_cache_t *thr_cache;
-static condvar_t thread_starter;
-static mutex_t starter_mutex;
+static CONDVAR_INITIALIZE(thread_starter);
+static MUTEX_INITIALIZE(starter_mutex, MUTEX_PASSIVE);
 
 #define THREADS  8
@@ -197,7 +197,4 @@
 
 	TPRINTF("Running stress test with size %d\n", size);
-
-	condvar_initialize(&thread_starter);
-	mutex_initialize(&starter_mutex, MUTEX_PASSIVE);
 
 	thr_cache = slab_cache_create("thread_cache", size, 0, NULL, NULL, 0);