diff --git a/kern/conf/conf.kern b/kern/conf/conf.kern
index 0338825..c3c1399 100644
--- a/kern/conf/conf.kern
+++ b/kern/conf/conf.kern
@@ -442,8 +442,8 @@ file		test/lib.c
 optfile net	test/nettest.c
 
 defoption synchprobs
-optfile   synchprobs  test/whalemating.c
-optfile   synchprobs  test/stoplight.c
+optfile   synchprobs  synchprobs/whalemating.c
+optfile   synchprobs  synchprobs/stoplight.c
 optfile   synchprobs  test/synchprobs.c
 
 defoption automationtest
diff --git a/kern/test/stoplight.c b/kern/synchprobs/stoplight.c
similarity index 100%
rename from kern/test/stoplight.c
rename to kern/synchprobs/stoplight.c
diff --git a/kern/test/whalemating.c b/kern/synchprobs/whalemating.c
similarity index 100%
rename from kern/test/whalemating.c
rename to kern/synchprobs/whalemating.c
diff --git a/kern/test/synchtest.c b/kern/test/synchtest.c
index 5c06e51..2ca6a21 100644
--- a/kern/test/synchtest.c
+++ b/kern/test/synchtest.c
@@ -142,11 +142,12 @@ semtest(int nargs, char **args)
 	(void)args;
 
 	inititems();
-	test_status = SUCCESS;
+	test_status = FAIL;
 	tkprintf("Starting semaphore test...\n");
 	tkprintf("If this hangs, it's broken: ");
 	P(testsem);
 	P(testsem);
+	test_status = SUCCESS;
 	tkprintf("ok\n");
 
 	for (i=0; i<NTHREADS; i++) {