--- a/test/jdk/tools/jpackage/helpers/JPackageHelper.java	Fri Apr 05 11:24:44 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/JPackageHelper.java	Tue Apr 09 10:57:04 2019 -0400
@@ -153,7 +153,7 @@
         return command;
     }
 
-    private static void deleteRecursive(File path) throws IOException {
+    public static void deleteRecursive(File path) throws IOException {
         if (!path.exists()) {
             return;
         }
@@ -191,7 +191,13 @@
     public static void deleteOutputFolder(String output) throws IOException {
         File outputFolder = new File(output);
         System.out.println("AMDEBUG output: " + outputFolder.getAbsolutePath());
-        deleteRecursive(outputFolder);
+        try {
+            deleteRecursive(outputFolder);
+        } catch (IOException ioe) {
+            System.out.println("IOException: " + ioe);
+            ioe.printStackTrace();
+            deleteRecursive(outputFolder);
+        }
     }
 
     public static String executeCLI(boolean retValZero, String... args) throws Exception {
@@ -344,7 +350,8 @@
         createModule("Hello.java");
     }
 
-    private static void createModule(String javaFile) throws Exception {
+    private static void createModule(String javaFile)
+            throws Exception {
         int retVal;
 
         File input = new File("input");