@@ -14,11 +14,11 @@
 #import "OFThread.h"
 #import "OFAutoreleasePool.h"
 #import "OFString.h"
 #import "OFExceptions.h"
 
-#import "main.h"
+#import "TestsAppDelegate.h"
 
 static OFString *module = @"OFThread";
 
 @interface TestThread: OFThread
 @end
@@ -31,12 +31,12 @@
 
 	return nil;
 }
 @end
 
-void
-thread_tests()
+@implementation TestsAppDelegate (OFThreadTests)
+- (void)threadTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	TestThread *t;
 	OFTLSKey *key;
 
@@ -53,5 +53,6 @@
 	TEST(@"+[objectForTLSKey:]",
 	    [[OFThread objectForTLSKey: key] isEqual: @"foo"])
 
 	[pool drain];
 }
+@end