@@ -15,44 +15,37 @@
 
 #include "config.h"
 
 #include <string.h>
 
-#import "TestsAppDelegate.h"
-
-static OFString *const module = @"OFTCPSocket";
-
-@implementation TestsAppDelegate (OFTCPSocketTests)
-- (void)TCPSocketTests
-{
-	void *pool = objc_autoreleasePoolPush();
-	OFTCPSocket *server, *client = nil, *accepted;
+#import "ObjFW.h"
+#import "ObjFWTest.h"
+
+@interface OFTCPSocketTests: OTTestCase
+@end
+
+@implementation OFTCPSocketTests
+- (void)testTCPSocket
+{
+	OFTCPSocket *server, *client, *accepted;
 	OFSocketAddress address;
 	char buffer[6];
 
-	TEST(@"+[socket]", (server = [OFTCPSocket socket]) &&
-	    (client = [OFTCPSocket socket]))
-
-	TEST(@"-[bindToHost:port:]",
-	    R(address = [server bindToHost: @"127.0.0.1" port: 0]))
-
-	TEST(@"-[listen]", R([server listen]))
-
-	TEST(@"-[connectToHost:port:]",
-	    R([client connectToHost: @"127.0.0.1"
-			       port: OFSocketAddressIPPort(&address)]))
-
-	TEST(@"-[accept]", (accepted = [server accept]))
-
-	TEST(@"-[remoteAddress]",
-	    [OFSocketAddressString(accepted.remoteAddress)
-	    isEqual: @"127.0.0.1"])
-
-	TEST(@"-[writeString:]", R([client writeString: @"Hello!"]))
-
-	TEST(@"-[readIntoBuffer:length:]",
-	    [accepted readIntoBuffer: buffer length: 6] &&
-	    !memcmp(buffer, "Hello!", 6))
-
-	objc_autoreleasePoolPop(pool);
+	server = [OFTCPSocket socket];
+	client = [OFTCPSocket socket];
+
+	address = [server bindToHost: @"127.0.0.1" port: 0];
+	[server listen];
+
+	[client connectToHost: @"127.0.0.1"
+			 port: OFSocketAddressIPPort(&address)];
+
+	accepted = [server accept];
+	OTAssertEqualObjects(OFSocketAddressString(accepted.remoteAddress),
+	    @"127.0.0.1");
+
+	[client writeString: @"Hello!"];
+
+	[accepted readIntoBuffer: buffer exactLength: 6];
+	OTAssertEqual(memcmp(buffer, "Hello!", 6), 0);
 }
 @end