Index: test/synch/rwlock4/test.c
===================================================================
--- test/synch/rwlock4/test.c	(revision e507afa088d8dc5b39f7813ae1e13adf07fa7645)
+++ test/synch/rwlock4/test.c	(revision dc747e33f6f5d74c7d1b7b50fda3b2fabff8fa82)
@@ -40,4 +40,5 @@
 #include <synch/rwlock.h>
 #include <synch/synch.h>
+#include <synch/spinlock.h>
 
 #define READERS		50
@@ -46,5 +47,5 @@
 static rwlock_t rwlock;
 
-static spinlock_t lock;
+SPINLOCK_INITIALIZE(lock);
 
 static waitq_t can_start;
Index: test/synch/semaphore2/test.c
===================================================================
--- test/synch/semaphore2/test.c	(revision e507afa088d8dc5b39f7813ae1e13adf07fa7645)
+++ test/synch/semaphore2/test.c	(revision dc747e33f6f5d74c7d1b7b50fda3b2fabff8fa82)
@@ -38,8 +38,9 @@
 #include <synch/semaphore.h>
 #include <synch/synch.h>
+#include <synch/spinlock.h>
 
 static semaphore_t sem;
 
-static spinlock_t lock;
+SPINLOCK_INITIALIZE(lock);
 
 static waitq_t can_start;