diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java
index d871c5ec1..3885c4168 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java
@@ -113,15 +113,16 @@ public class PathSuffixFilterTest extends RepositoryTestCase {
 
 	private List<String> getMatchingPaths(String suffixFilter,
 			final ObjectId treeId, boolean recursiveWalk) throws IOException {
-		final TreeWalk tw = new TreeWalk(db);
-		tw.setFilter(PathSuffixFilter.create(suffixFilter));
-		tw.setRecursive(recursiveWalk);
-		tw.addTree(treeId);
-
-		List<String> paths = new ArrayList<String>();
-		while (tw.next())
-			paths.add(tw.getPathString());
-		return paths;
+		try (final TreeWalk tw = new TreeWalk(db)) {
+			tw.setFilter(PathSuffixFilter.create(suffixFilter));
+			tw.setRecursive(recursiveWalk);
+			tw.addTree(treeId);
+
+			List<String> paths = new ArrayList<String>();
+			while (tw.next())
+				paths.add(tw.getPathString());
+			return paths;
+		}
 	}
 
 }