Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -148,11 +148,11 @@
 	return self;
 }
 
 - (id)join
 {
-	if (running != OF_THREAD_WAITING_FOR_JOIN || !of_thread_join(thread))
+	if (running == OF_THREAD_NOT_RUNNING || !of_thread_join(thread))
 		@throw [OFThreadJoinFailedException newWithClass: isa];
 
 	running = OF_THREAD_NOT_RUNNING;
 
 	return retval;

Index: tests/OFThreadTests.m
==================================================================
--- tests/OFThreadTests.m
+++ tests/OFThreadTests.m
@@ -41,11 +41,11 @@
 	OFTLSKey *key;
 
 	TEST(@"+[threadWithObject:]",
 	    (t = [TestThread threadWithObject: @"foo"]))
 
-	TEST(@"-[run]", [t start])
+	TEST(@"-[start]", [t start])
 
 	TEST(@"-[join]", [[t join] isEqual: @"success"])
 
 	TEST(@"OFTLSKey's +[tlsKey]", (key = [OFTLSKey tlsKey]))