@@ -15,38 +15,39 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFThread";
+static OFString *const module = @"OFThread";
 
 @interface TestThread: OFThread
 @end
 
 @implementation TestThread
 - (id)main
 {
 	[[OFThread threadDictionary] setObject: @"bar" forKey: @"foo"];
+	OFEnsure([[[OFThread threadDictionary]
+	    objectForKey: @"foo"] isEqual: @"bar"]);
 
 	return @"success";
 }
 @end
 
 @implementation TestsAppDelegate (OFThreadTests)
 - (void)threadTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	TestThread *t;
-	OFMutableDictionary *d;
-
-	TEST(@"+[thread]", (t = [TestThread thread]))
-
-	TEST(@"-[start]", R([t start]))
-
-	TEST(@"-[join]", [[t join] isEqual: @"success"])
-
-	TEST(@"-[threadDictionary]", (d = [OFThread threadDictionary]) &&
-	    [d objectForKey: @"foo"] == nil)
+	TestThread *thread;
+
+	TEST(@"+[thread]", (thread = [TestThread thread]))
+
+	TEST(@"-[start]", R([thread start]))
+
+	TEST(@"-[join]", [[thread join] isEqual: @"success"])
+
+	TEST(@"-[threadDictionary]",
+	    [[OFThread threadDictionary] objectForKey: @"foo"] == nil)
 
 	objc_autoreleasePoolPop(pool);
 }
 @end