@@ -19,14 +19,10 @@
 
 @implementation TestsAppDelegate (OFSystemInfoTests)
 - (void)systemInfoTests
 {
 	void *pool = objc_autoreleasePoolPush();
-#ifdef OF_SYSTEM_INFO_HAS_NETWORK_INTERFACES
-	OFDictionary *networkInterfaces;
-	bool firstInterface = true;
-#endif
 
 	[OFStdOut setForegroundColor: [OFColor lime]];
 
 	[OFStdOut writeFormat: @"[OFSystemInfo] Page size: %zd\n",
 	    [OFSystemInfo pageSize]];
@@ -109,74 +105,13 @@
 #ifdef OF_POWERPC
 	[OFStdOut writeFormat: @"[OFSystemInfo] Supports AltiVec: %d\n",
 	    [OFSystemInfo supportsAltiVec]];
 #endif
 
-#ifdef OF_SYSTEM_INFO_HAS_NETWORK_INTERFACES
-	[OFStdOut writeString: @"[OFSystemInfo] Network interfaces: "];
-	networkInterfaces = [OFSystemInfo networkInterfaces];
-	for (OFString *name in networkInterfaces) {
-		OFDictionary *interface = [networkInterfaces
-		    objectForKey: name];
-		OFData *etherAddr = [interface
-		    objectForKey: OFNetworkInterfaceEthernetAddress];
-		bool firstAddress = true;
-		OFData *addrs;
-
-		if (!firstInterface)
-			[OFStdOut writeString: @"; "];
-		firstInterface = false;
-
-		[OFStdOut writeFormat: @"%@(", name];
-
-		if (etherAddr.itemSize == 1 && etherAddr.count == 6) {
-			const unsigned char *addr = etherAddr.items;
-			[OFStdOut writeFormat:
-			    @"MAC=%02X:%02X:%02X:%02X:%02X:%02X",
-			    addr[0], addr[1], addr[2], addr[3], addr[4],
-			    addr[5]];
-			firstAddress = false;
-		}
-
-		addrs = [interface objectForKey: OFNetworkInterfaceAddresses];
-		for (size_t i = 0; i < addrs.count; i++) {
-			const OFSocketAddress *addr = [addrs itemAtIndex: i];
-			OFString *string;
-
-			@try {
-				string = OFSocketAddressString(addr);
-			} @catch (OFInvalidArgumentException *e) {
-				continue;
-			}
-
-			if (!firstAddress)
-				[OFStdOut writeString: @", "];
-			firstAddress = nil;
-
-			switch (addr->family) {
-			case OFSocketAddressFamilyIPv4:
-				[OFStdOut writeString: @"IPv4="];
-				break;
-			case OFSocketAddressFamilyIPv6:
-				[OFStdOut writeString: @"IPv6="];
-				break;
-			case OFSocketAddressFamilyIPX:
-				[OFStdOut writeString: @"IPX="];
-				break;
-			case OFSocketAddressFamilyAppleTalk:
-				[OFStdOut writeString: @"AppleTalk="];
-				break;
-			default:
-				[OFStdOut writeString: @"unknown="];
-			}
-
-			[OFStdOut writeString: string];
-		}
-
-		[OFStdOut writeString: @")"];
-	}
-	[OFStdOut writeString: @"\n"];
+#ifdef OF_HAVE_SOCKETS
+	[OFStdOut writeFormat: @"[OFSystemInfo] Network interfaces: %@\n",
+	    [[OFSystemInfo networkInterfaces] componentsJoinedByString: @", "]];
 #endif
 
 	objc_autoreleasePoolPop(pool);
 }
 @end