--- a/jdk/test/java/nio/file/Files/walkFileTree/SkipSubtree.java	Tue Apr 30 13:12:54 2013 -0700
+++ b/jdk/test/java/nio/file/Files/walkFileTree/SkipSubtree.java	Tue Apr 30 21:19:24 2013 +0100
@@ -24,6 +24,7 @@
 /*
  * @test
  * @summary Unit test for Files.walkFileTree to test SKIP_SUBTREE return value
+ * @library ../..
  * @compile SkipSubtree.java CreateFileTree.java
  * @run main SkipSubtree
  */
@@ -58,9 +59,16 @@
     }
 
     public static void main(String[] args) throws Exception {
-        Path dir = CreateFileTree.create();
+        Path top = CreateFileTree.create();
+        try {
+            test(top);
+        } finally {
+            TestUtil.removeAll(top);
+        }
+    }
 
-        Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+    static void test(final Path start) throws IOException {
+        Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
             @Override
             public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
                 check(dir);