@@ -19,13 +19,10 @@
 
 @implementation TestsAppDelegate (OFSystemInfoTests)
 - (void)systemInfoTests
 {
 	void *pool = objc_autoreleasePoolPush();
-#ifdef OF_HAVE_FILES
-	OFString *userConfigPath, *userDataPath;
-#endif
 
 	[OFStdOut setForegroundColor: [OFColor lime]];
 
 	[OFStdOut writeFormat: @"[OFSystemInfo] Page size: %zd\n",
 	    [OFSystemInfo pageSize]];
@@ -47,27 +44,18 @@
 
 	[OFStdOut writeFormat:
 	    @"[OFSystemInfo] Operating system version: %@\n",
 	    [OFSystemInfo operatingSystemVersion]];
 
-#ifdef OF_HAVE_FILES
-	@try {
-		userConfigPath = [OFSystemInfo userConfigPath];
-	} @catch (OFNotImplementedException *e) {
-		userConfigPath = @"Not implemented";
-	}
-	[OFStdOut writeFormat: @"[OFSystemInfo] User config path: %@\n",
-	    userConfigPath];
-
-	@try {
-		userDataPath = [OFSystemInfo userDataPath];
-	} @catch (OFNotImplementedException *e) {
-		userDataPath = @"Not implemented";
-	}
-	[OFStdOut writeFormat: @"[OFSystemInfo] User data path: %@\n",
-	    userDataPath];
-#endif
+	[OFStdOut writeFormat: @"[OFSystemInfo] User config URL: %@\n",
+	    [OFSystemInfo userConfigURL].string];
+
+	[OFStdOut writeFormat: @"[OFSystemInfo] User data URL: %@\n",
+	    [OFSystemInfo userDataURL].string];
+
+	[OFStdOut writeFormat: @"[OFSystemInfo] Temporary directory URL: %@\n",
+	    [OFSystemInfo temporaryDirectoryURL].string];
 
 	[OFStdOut writeFormat: @"[OFSystemInfo] CPU vendor: %@\n",
 	    [OFSystemInfo CPUVendor]];
 
 	[OFStdOut writeFormat: @"[OFSystemInfo] CPU model: %@\n",