diff --git a/src/jpa-engine/core/src/test/java/com/impetus/kundera/utils/LuceneCleanupUtilities.java b/src/jpa-engine/core/src/test/java/com/impetus/kundera/utils/LuceneCleanupUtilities.java
index <HASH>..<HASH> 100644
--- a/src/jpa-engine/core/src/test/java/com/impetus/kundera/utils/LuceneCleanupUtilities.java
+++ b/src/jpa-engine/core/src/test/java/com/impetus/kundera/utils/LuceneCleanupUtilities.java
@@ -53,10 +53,14 @@ public class LuceneCleanupUtilities
                 {
                     for (File file : files)
                     {
-                        // Delete each file
-                        if (!file.delete())
-                        {
-                        }
+                    	if(file.isDirectory() && !(file.list().length==0)){
+                    	
+                    			cleanDir(file.getPath());
+                    			file.delete();
+                    	}else{
+                    		file.delete();
+                    	}
+                        
                     }
                 }
             }
for recursively cleaning the directory