@@ -41,22 +41,24 @@
 	    @"bool=false\r\n"
 	    @"float=0.25\r\n"
 	    @"array1=foo\r\n"
 	    @"array1=bar\r\n"
 	    @"double=0.75\r\n";
+	OFURL *URL;
 	OFINIFile *file;
 	OFINICategory *tests, *foobar, *types;
 	OFArray *array;
 #ifndef OF_NINTENDO_DS
-	OFString *writePath;
+	OFURL *writeURL;
 #endif
 
 	module = @"OFINIFile";
 
-	TEST(@"+[fileWithPath:encoding:]",
-	    (file = [OFINIFile fileWithPath: @"testfile.ini"
-				   encoding: OFStringEncodingCodepage437]))
+	URL = [OFURL fileURLWithPath: @"testfile.ini"];
+	TEST(@"+[fileWithURL:encoding:]",
+	    (file = [OFINIFile fileWithURL: URL
+				  encoding: OFStringEncodingCodepage437]))
 
 	tests = [file categoryForName: @"tests"];
 	foobar = [file categoryForName: @"foobar"];
 	types = [file categoryForName: @"types"];
 	TEST(@"-[categoryForName:]",
@@ -112,23 +114,22 @@
 
 	module = @"OFINIFile";
 
 	/* FIXME: Find a way to write files on Nintendo DS */
 #ifndef OF_NINTENDO_DS
-	writePath = [[OFSystemInfo temporaryDirectoryURL]
+	writeURL = [[OFSystemInfo temporaryDirectoryURL]
 	    URLByAppendingPathComponent: @"objfw-tests.ini"
-			    isDirectory: false]
-	    .fileSystemRepresentation;
+			    isDirectory: false];
 	TEST(@"-[writeToFile:encoding:]",
-	    R([file writeToFile: writePath
-		       encoding: OFStringEncodingCodepage437]) &&
-	    [[OFString stringWithContentsOfFile: writePath
-				       encoding: OFStringEncodingCodepage437]
+	    R([file writeToURL: writeURL
+		      encoding: OFStringEncodingCodepage437]) &&
+	    [[OFString stringWithContentsOfURL: writeURL
+				      encoding: OFStringEncodingCodepage437]
 	    isEqual: output])
-	[[OFFileManager defaultManager] removeItemAtPath: writePath];
+	[[OFFileManager defaultManager] removeItemAtURL: writeURL];
 #else
 	(void)output;
 #endif
 
 	objc_autoreleasePoolPop(pool);
 }
 @end