diff --git a/test/src/thd.c b/test/src/thd.c
index 233242a1..7e53625f 100644
--- a/test/src/thd.c
+++ b/test/src/thd.c
@@ -14,7 +14,8 @@ void
 thd_join(thd_t thd, void **ret)
 {
 
-	WaitForSingleObject(thd, INFINITE);
+	if (WaitForSingleObject(thd, INFINITE) == WAIT_OBJECT_0 && ret)
+		GetExitCodeThread(thd, (LPDWORD) ret);
 }
 
 #else