diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java
index 99d6801f3..aa46d1a2b 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java
@@ -82,38 +82,42 @@ public void testIterator() throws IllegalStateException, IOException,
 		}
 		FileTreeIteratorWithTimeControl fileIt = new FileTreeIteratorWithTimeControl(
 				db, modTimes);
-		NameConflictTreeWalk tw = new NameConflictTreeWalk(db);
-		tw.addTree(fileIt);
-		tw.setRecursive(true);
-		FileTreeIterator t;
-		long t0 = 0;
-		for (int i = 0; i < 10; i++) {
-			assertTrue(tw.next());
-			t = tw.getTree(0, FileTreeIterator.class);
-			if (i == 0)
-				t0 = t.getEntryLastModified();
-			else
-				assertEquals(t0, t.getEntryLastModified());
-		}
-		long t1 = 0;
-		for (int i = 0; i < 10; i++) {
-			assertTrue(tw.next());
-			t = tw.getTree(0, FileTreeIterator.class);
-			if (i == 0) {
-				t1 = t.getEntryLastModified();
-				assertTrue(t1 > t0);
-			} else
-				assertEquals(t1, t.getEntryLastModified());
-		}
-		long t2 = 0;
-		for (int i = 0; i < 10; i++) {
-			assertTrue(tw.next());
-			t = tw.getTree(0, FileTreeIterator.class);
-			if (i == 0) {
-				t2 = t.getEntryLastModified();
-				assertTrue(t2 > t1);
-			} else
-				assertEquals(t2, t.getEntryLastModified());
+		try (NameConflictTreeWalk tw = new NameConflictTreeWalk(db)) {
+			tw.addTree(fileIt);
+			tw.setRecursive(true);
+			FileTreeIterator t;
+			long t0 = 0;
+			for (int i = 0; i < 10; i++) {
+				assertTrue(tw.next());
+				t = tw.getTree(0, FileTreeIterator.class);
+				if (i == 0) {
+					t0 = t.getEntryLastModified();
+				} else {
+					assertEquals(t0, t.getEntryLastModified());
+				}
+			}
+			long t1 = 0;
+			for (int i = 0; i < 10; i++) {
+				assertTrue(tw.next());
+				t = tw.getTree(0, FileTreeIterator.class);
+				if (i == 0) {
+					t1 = t.getEntryLastModified();
+					assertTrue(t1 > t0);
+				} else {
+					assertEquals(t1, t.getEntryLastModified());
+				}
+			}
+			long t2 = 0;
+			for (int i = 0; i < 10; i++) {
+				assertTrue(tw.next());
+				t = tw.getTree(0, FileTreeIterator.class);
+				if (i == 0) {
+					t2 = t.getEntryLastModified();
+					assertTrue(t2 > t1);
+				} else {
+					assertEquals(t2, t.getEntryLastModified());
+				}
+			}
 		}
 	}