@@ -181,17 +181,19 @@
 		return OFApplicationMain(&argc, &argv,
 		    [[TestsAppDelegate alloc] init]);
 	} @catch (id e) {
 		OFString *string = [OFString stringWithFormat:
 		    @"\nRuntime error: Unhandled exception:\n%@\n", e];
-		OFString *backtrace = [OFString stringWithFormat:
-		    @"\nBacktrace:\n  %@\n\n",
-		    [[e backtrace] componentsJoinedByString: @"\n  "]];
 
 		[OFStdOut setForegroundColor: [OFColor red]];
 		[OFStdOut writeString: string];
-		[OFStdOut writeString: backtrace];
+
+		if ([e stackTraceAddresses] != nil)
+			[OFStdOut writeString: @"\nStack trace:\n"];
+
+		for (OFValue *address in [e stackTraceAddresses])
+			[OFStdOut writeFormat: @"  %p\n", address.pointerValue];
 
 # if defined(OF_WII)
 		[OFStdOut reset];
 		[OFStdOut writeString: @"Press home button to exit!"];
 
@@ -429,11 +431,11 @@
 	[self kernelEventObserverTests];
 #endif
 #ifdef OF_HAVE_THREADS
 	[self threadTests];
 #endif
-	[self URLTests];
+	[self URITests];
 #if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
 	[self HTTPClientTests];
 #endif
 #ifdef OF_HAVE_SOCKETS
 	[self HTTPCookieTests];