@@ -13,44 +13,42 @@
  * file.
  */
 
 #include "config.h"
 
-#import "TestsAppDelegate.h"
+#import "ObjFW.h"
+#import "ObjFWTest.h"
 
 #import "plugin/TestPlugin.h"
 
-#ifndef OF_IOS
-static OFString *const pluginName = @"plugin/TestPlugin";
-#else
-static OFString *const pluginName = @"PlugIns/TestPlugin";
-#endif
-
-static OFString *const module = @"OFPlugin";
-
-@implementation TestsAppDelegate (OFPluginTests)
-- (void)pluginTests
-{
-	void *pool = objc_autoreleasePoolPush();
+@interface OFPluginTests: OTTestCase
+@end
+
+@implementation OFPluginTests
+- (void)testPlugin
+{
 	OFString *path;
 	OFPlugin *plugin;
 	Class (*class)(void);
 	TestPlugin *test;
 
-	TEST(@"+[pathForName:]", (path = [OFPlugin pathForName: pluginName]))
-
-	TEST(@"+[pluginWithPath:]", (plugin = [OFPlugin pluginWithPath: path]))
-
-	TEST(@"-[addressForSymbol:]",
-	    (class = (Class (*)(void))(uintptr_t)
-	    [plugin addressForSymbol: @"class"]))
-
-	test = [[class() alloc] init];
-	@try {
-		TEST(@"TestPlugin's -[test:]", [test test: 1234] == 2468)
+#ifndef OF_IOS
+	path = [OFPlugin pathForName: @"plugin/TestPlugin"];
+#else
+	path = [OFPlugin pathForName: @"PlugIns/TestPlugin"];
+#endif
+	OTAssertNotNil(path);
+
+	plugin = [OFPlugin pluginWithPath: path];
+	OTAssertNotNil(plugin);
+
+	class = (Class (*)(void))(uintptr_t)[plugin addressForSymbol: @"class"];
+	OTAssert(class != NULL);
+
+	@try {
+		test = [[class() alloc] init];
+		OTAssertEqual([test test: 1234], 2468);
 	} @finally {
 		[test release];
 	}
-
-	objc_autoreleasePoolPop(pool);
 }
 @end