@@ -13,18 +13,19 @@
  * file.
  */
 
 #include "config.h"
 
-#import "TestsAppDelegate.h"
-
-static OFString *const module = @"OFSubprocess";
-
-@implementation TestsAppDelegate (OFSubprocessTests)
-- (void)subprocessTests
-{
-	void *pool = objc_autoreleasePoolPush();
+#import "ObjFW.h"
+#import "ObjFWTest.h"
+
+@interface OFSubprocessTests: OTTestCase
+@end
+
+@implementation OFSubprocessTests
+- (void)testSubprocess
+{
 #ifdef OF_HAVE_FILES
 	OFString *program = [@"subprocess" stringByAppendingPathComponent:
 	    @"subprocess" @PROG_SUFFIX];
 #else
 	OFString *program = @"subprocess/subprocess" @PROG_SUFFIX;
@@ -34,24 +35,18 @@
 	    [[[OFApplication environment] mutableCopy] autorelease];
 	OFSubprocess *subprocess;
 
 	[environment setObject: @"yés" forKey: @"tëst"];
 
-	TEST(@"+[subprocessWithProgram:programName:arguments:environment]",
-	    (subprocess =
-	    [OFSubprocess subprocessWithProgram: program
-				    programName: program
-				      arguments: arguments
-				    environment: environment]))
-
-	TEST(@"Standard input", R([subprocess writeLine: @"Hellö world!"]))
-
-	TEST(@"Standard output",
-	    [[subprocess readLine] isEqual: @"HELLÖ WORLD!"])
-
-	TEST(@"-[closeForWriting]", R([subprocess closeForWriting]))
-
-	TEST(@"-[waitForTermination]", [subprocess waitForTermination] == 0)
-
-	objc_autoreleasePoolPop(pool);
+	subprocess = [OFSubprocess subprocessWithProgram: program
+					     programName: program
+					       arguments: arguments
+					     environment: environment];
+
+	[subprocess writeLine: @"Hellö world!"];
+	OTAssertEqualObjects([subprocess readLine], @"HELLÖ WORLD!");
+
+	[subprocess closeForWriting];
+
+	OTAssertEqual([subprocess waitForTermination], 0);
 }
 @end