diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java
index bcfe9925e..e0a1c66d7 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java
@@ -1466,6 +1466,7 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
                 destroyServers();
                 distribTearDown();
             } catch (Exception e) {
+                FileUtils.deleteDirectory(testDir);
                 e.printStackTrace();
             }
         }