diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
index 3fc3d0a06..7bd329c72 100644
--- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
+++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
@@ -291,8 +291,12 @@ public abstract class AbstractIntegrationTest implements EnvironmentAware {
     }
 
     @After
-    public void cleanCurrentCollection() throws IOException {
-        FileUtils.deleteDirectory(new File(artifactFilesystemProperties.getPath()));
+    public void cleanUp() {
+        try {
+            FileUtils.deleteDirectory(new File(artifactFilesystemProperties.getPath()));
+        } catch (final IOException e) {
+            LOG.warn("Cannot cleanup file-directory", e);
+        }
     }
 
     protected DefaultMockMvcBuilder createMvcWebAppContext() {