diff -r ac6e7be35ea8 -r 5f7202c2125d langtools/test/tools/sjavac/CompileWithOverrideSources.java
--- a/langtools/test/tools/sjavac/CompileWithOverrideSources.java	Thu Nov 26 07:44:23 2015 +0530
+++ b/langtools/test/tools/sjavac/CompileWithOverrideSources.java	Thu Nov 26 09:33:41 2015 +0100
@@ -48,9 +48,7 @@
     // Compile gensrc and gensrc2. However do not compile broken beta.B in gensrc,
     // only compile ok beta.B in gensrc2
     void test() throws Exception {
-        clean(TEST_ROOT);
         Files.createDirectories(BIN);
-        clean(GENSRC, GENSRC2, GENSRC3, BIN);
 
         Map<String,Long> previous_bin_state = collectState(BIN);
         ToolBox tb = new ToolBox();
@@ -80,7 +78,7 @@
                                      BIN + "/javac_state");
 
         System.out.println("----- Compile with exluded beta went well!");
-        clean(BIN);
+        tb.cleanDirectory(BIN);
         compileExpectFailure(GENSRC.toString(),
                              GENSRC2.toString(),
                              "-d", BIN.toString(),
@@ -90,6 +88,5 @@
                              SERVER_ARG);
 
         System.out.println("----- Compile without exluded beta failed, as expected! Good!");
-        clean(GENSRC, GENSRC2, BIN);
     }
 }