Index: test/fpu/fpu1/test.c
===================================================================
--- test/fpu/fpu1/test.c	(revision 59e07c91fccb189beb5623b72a240b638917ebb2)
+++ test/fpu/fpu1/test.c	(revision feb1a4141fd0d63c75a526e5c9edb96d92157e55)
@@ -46,5 +46,5 @@
 static inline double sqrt(double x) { double v; __asm__ ("fsqrt\n" : "=t" (v) : "0" (x)); return v; }
 
-static volatile int threads_ok;
+static atomic_t threads_ok;
 static waitq_t can_start;
 
Index: test/fpu/mips1/test.c
===================================================================
--- test/fpu/mips1/test.c	(revision 59e07c91fccb189beb5623b72a240b638917ebb2)
+++ test/fpu/mips1/test.c	(revision feb1a4141fd0d63c75a526e5c9edb96d92157e55)
@@ -42,5 +42,5 @@
 #define ATTEMPTS        5
 
-static volatile int threads_ok;
+static atomic_t threads_ok;
 static waitq_t can_start;
 
Index: test/fpu/sse1/test.c
===================================================================
--- test/fpu/sse1/test.c	(revision 59e07c91fccb189beb5623b72a240b638917ebb2)
+++ test/fpu/sse1/test.c	(revision feb1a4141fd0d63c75a526e5c9edb96d92157e55)
@@ -42,5 +42,5 @@
 #define ATTEMPTS        5
 
-static volatile int threads_ok;
+static atomic_t threads_ok;
 static waitq_t can_start;
 
Index: test/synch/rwlock5/test.c
===================================================================
--- test/synch/rwlock5/test.c	(revision 59e07c91fccb189beb5623b72a240b638917ebb2)
+++ test/synch/rwlock5/test.c	(revision feb1a4141fd0d63c75a526e5c9edb96d92157e55)
@@ -76,5 +76,5 @@
 {
 	int i, j, k;
-	int readers, writers;
+	count_t readers, writers;
 	
 	printf("Read/write locks test #5\n");