diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-attachments/src/main/java/org/xwiki/store/filesystem/internal/DefaultFilesystemStoreTools.java b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-attachments/src/main/java/org/xwiki/store/filesystem/internal/DefaultFilesystemStoreTools.java
index 9c69d29..a6daf6c 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-attachments/src/main/java/org/xwiki/store/filesystem/internal/DefaultFilesystemStoreTools.java
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-attachments/src/main/java/org/xwiki/store/filesystem/internal/DefaultFilesystemStoreTools.java
@@ -30,6 +30,7 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import org.apache.commons.lang.RandomStringUtils;
 import org.xwiki.component.annotation.Component;
 import org.xwiki.component.phase.Initializable;
 import org.xwiki.context.Execution;
@@ -179,13 +180,13 @@ private static boolean deleteEmptyDirs(final File location)
     @Override
     public File getBackupFile(final File storageFile)
     {
-        return new File(storageFile.getAbsolutePath() + BACKUP_FILE_SUFFIX);
+        return new File(storageFile.getAbsolutePath() + BACKUP_FILE_SUFFIX + RandomStringUtils.randomAlphanumeric(6));
     }
 
     @Override
     public File getTempFile(final File storageFile)
     {
-        return new File(storageFile.getAbsolutePath() + TEMP_FILE_SUFFIX);
+        return new File(storageFile.getAbsolutePath() + TEMP_FILE_SUFFIX + RandomStringUtils.randomAlphanumeric(6));
     }
 
     @Override