Index: kernel/test/atomic/atomic1.c
===================================================================
--- kernel/test/atomic/atomic1.c	(revision c21d4d64870698b91707f203def6398db79bff84)
+++ kernel/test/atomic/atomic1.c	(revision b4edc96c3455b41ece7d35a9752221342dec22f8)
@@ -32,5 +32,5 @@
 const char *test_atomic1(void)
 {
-	atomic_t a;
+	atomic_int a;
 
 	atomic_store(&a, 10);
Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision c21d4d64870698b91707f203def6398db79bff84)
+++ kernel/test/mm/falloc2.c	(revision b4edc96c3455b41ece7d35a9752221342dec22f8)
@@ -43,6 +43,6 @@
 #define THREADS      8
 
-static atomic_t thread_cnt;
-static atomic_t thread_fail;
+static atomic_size_t thread_cnt;
+static atomic_size_t thread_fail;
 
 static void falloc(void *arg)
Index: kernel/test/synch/semaphore1.c
===================================================================
--- kernel/test/synch/semaphore1.c	(revision c21d4d64870698b91707f203def6398db79bff84)
+++ kernel/test/synch/semaphore1.c	(revision b4edc96c3455b41ece7d35a9752221342dec22f8)
@@ -41,6 +41,6 @@
 
 static waitq_t can_start;
-static atomic_t items_produced;
-static atomic_t items_consumed;
+static atomic_size_t items_produced;
+static atomic_size_t items_consumed;
 
 static void producer(void *arg)
Index: kernel/test/thread/thread1.c
===================================================================
--- kernel/test/thread/thread1.c	(revision c21d4d64870698b91707f203def6398db79bff84)
+++ kernel/test/thread/thread1.c	(revision b4edc96c3455b41ece7d35a9752221342dec22f8)
@@ -30,4 +30,5 @@
 #include <test.h>
 #include <atomic.h>
+#include <stdbool.h>
 #include <proc/thread.h>
 
@@ -36,6 +37,6 @@
 #define THREADS  5
 
-static atomic_t finish;
-static atomic_t threads_finished;
+static atomic_bool finish;
+static atomic_size_t threads_finished;
 
 static void threadtest(void *data)
@@ -55,5 +56,5 @@
 	size_t total = 0;
 
-	atomic_store(&finish, 1);
+	atomic_store(&finish, true);
 	atomic_store(&threads_finished, 0);
 
@@ -72,5 +73,5 @@
 	thread_sleep(10);
 
-	atomic_store(&finish, 0);
+	atomic_store(&finish, false);
 	while (atomic_load(&threads_finished) < total) {
 		TPRINTF("Threads left: %zu\n", total - atomic_load(&threads_finished));