Index: kernel/test/synch/rcu1.c
===================================================================
--- kernel/test/synch/rcu1.c	(revision 7f11dc6ba31c85d4b1daa9c4ebd4d6f99082a87c)
+++ kernel/test/synch/rcu1.c	(revision 6a5d05bd2551e64111bea4f9332dd7448c26ce84)
@@ -114,7 +114,7 @@
 			do {
 				int ret = thread_join_timeout(thread[i], 5 * 1000 * 1000, 0);
-				joined = (ret != ESYNCH_TIMEOUT);
+				joined = (ret != ETIMEOUT);
 				
-				if (ret == ESYNCH_OK_BLOCKED) {
+				if (ret == EOK) {
 					TPRINTF("%zu threads remain\n", thread_cnt - i - 1);
 				}
Index: kernel/test/synch/semaphore2.c
===================================================================
--- kernel/test/synch/semaphore2.c	(revision 7f11dc6ba31c85d4b1daa9c4ebd4d6f99082a87c)
+++ kernel/test/synch/semaphore2.c	(revision 6a5d05bd2551e64111bea4f9332dd7448c26ce84)
@@ -70,5 +70,5 @@
 	TPRINTF("cpu%u, tid %" PRIu64 " down+ (%d)\n", CPU->id, THREAD->tid, to);
 	rc = semaphore_down_timeout(&sem, to);
-	if (SYNCH_FAILED(rc)) {
+	if (rc != EOK) {
 		TPRINTF("cpu%u, tid %" PRIu64 " down!\n", CPU->id, THREAD->tid);
 		return;