Index: kernel/test/avltree/avltree1.c
===================================================================
--- kernel/test/avltree/avltree1.c	(revision 7d440e37e1f2b1dd61cdeb800e63b239608e913d)
+++ kernel/test/avltree/avltree1.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -195,5 +195,5 @@
 }
 
-static void test_tree_insert(avltree_t *tree, count_t node_count)
+static void test_tree_insert(avltree_t *tree, size_t node_count)
 {
 	unsigned int i;
@@ -202,5 +202,5 @@
 	avltree_create(tree);
 	
-	TPRINTF("Inserting %" PRIc " nodes...", node_count);
+	TPRINTF("Inserting %" PRIs " nodes...", node_count);
 	
 	for (i = 0; i < node_count; i++) {
@@ -215,5 +215,5 @@
 }
 
-static void test_tree_delete(avltree_t *tree, count_t node_count,
+static void test_tree_delete(avltree_t *tree, size_t node_count,
     int node_position)
 {
@@ -246,5 +246,5 @@
 }
 
-static void test_tree_delmin(avltree_t *tree, count_t node_count)
+static void test_tree_delmin(avltree_t *tree, size_t node_count)
 {
 	unsigned int i = 0;
Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision 7d440e37e1f2b1dd61cdeb800e63b239608e913d)
+++ kernel/test/mm/falloc2.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -53,5 +53,5 @@
 	int order, run, allocated, i;
 	uint8_t val = THREAD->tid % THREADS;
-	index_t k;
+	size_t k;
 	
 	void **frames =  (void **) malloc(MAX_FRAMES * sizeof(void *), FRAME_ATOMIC);
@@ -83,7 +83,7 @@
 			
 			for (i = 0; i < allocated; i++) {
-				for (k = 0; k <= (((index_t) FRAME_SIZE << order) - 1); k++) {
+				for (k = 0; k <= (((size_t) FRAME_SIZE << order) - 1); k++) {
 					if (((uint8_t *) frames[i])[k] != val) {
-						TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %#" PRIi "\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
+						TPRINTF("Thread #%" PRIu64 " (cpu%u): Unexpected data (%c) in block %p offset %#" PRIs "\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
 						atomic_inc(&thread_fail);
 						goto cleanup;
Index: kernel/test/mm/purge1.c
===================================================================
--- kernel/test/mm/purge1.c	(revision 7d440e37e1f2b1dd61cdeb800e63b239608e913d)
+++ kernel/test/mm/purge1.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -38,5 +38,5 @@
 
 extern void tlb_invalidate_all(void);
-extern void tlb_invalidate_pages(asid_t asid, uintptr_t va, count_t cnt);
+extern void tlb_invalidate_pages(asid_t asid, uintptr_t va, size_t cnt);
 
 char *test_purge1(void)
Index: kernel/test/synch/rwlock4.c
===================================================================
--- kernel/test/synch/rwlock4.c	(revision 7d440e37e1f2b1dd61cdeb800e63b239608e913d)
+++ kernel/test/synch/rwlock4.c	(revision c8b9f888f9cd96049886eedc03df789a62e60788)
@@ -149,5 +149,5 @@
 	
 	context_save(&ctx);
-	TPRINTF("sp=%#x, readers_in=%" PRIc "\n", ctx.sp, rwlock.readers_in);
+	TPRINTF("sp=%#x, readers_in=%" PRIs "\n", ctx.sp, rwlock.readers_in);
 	TPRINTF("Creating %" PRIu32 " readers\n", rd);