Index: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 1571616) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -446,9 +446,18 @@ * @throws IOException */ public boolean cleanupDataTestDirOnTestFS() throws IOException { - boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true); + FileSystem fs = getTestFileSystem(); + boolean ret = fs.delete(dataTestDirOnTestFS, true); if (ret) dataTestDirOnTestFS = null; + try { + if (fs != null) { + LOG.info("Closing down TestFileSystem in cleanupDataTestDirOnTestFS"); + fs.close(); + } + } catch (IOException e) { + LOG.error("error closing file system", e); + } return ret; }