Index: src/uk/me/parabola/mkgmap/Options.java
===================================================================
--- src/uk/me/parabola/mkgmap/Options.java	(revision 3637)
+++ src/uk/me/parabola/mkgmap/Options.java	(working copy)
@@ -76,8 +76,10 @@
 			return;
 		}
 
-		Reader r = new FileReader(filename);
-		readOptionFile(r, filename);
+		try (Reader r = new FileReader(filename);) {
+			readOptionFile(r, filename);
+		}
+		
 	}
 
 	public void readOptionFile(Reader r, String filename) {
Index: test/func/ArgsTest.java
===================================================================
--- test/func/ArgsTest.java	(revision 3637)
+++ test/func/ArgsTest.java	(working copy)
@@ -80,6 +80,8 @@
 
 	@Test
 	public void testDisplayPriority() throws FileNotFoundException {
+		TestUtils.registerFile("osmmap.img");
+		 
 		int pri = 42;
 		Outputs op = TestUtils.run("--draw-priority=" + pri,
 				Args.TEST_RESOURCE_OSM + "uk-test-1.osm.gz");
Index: test/uk/me/parabola/mkgmap/CommandArgsTest.java
===================================================================
--- test/uk/me/parabola/mkgmap/CommandArgsTest.java	(revision 3637)
+++ test/uk/me/parabola/mkgmap/CommandArgsTest.java	(working copy)
@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import uk.me.parabola.imgfmt.Utils;
-
 import func.lib.TestUtils;
 import org.junit.Test;
 
@@ -202,12 +200,8 @@
 
 	private void createFile(String name, String content) throws IOException {
 		TestUtils.registerFile(name);
-		Writer w = null;
-		try {
-			w = new FileWriter(name);
+		try (Writer w = new FileWriter(name);){
 			w.append(content);
-		} finally {
-			Utils.closeFile(w);
 		}
 	}