diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
index 8aebd995421ceac9e6d3b9d959ab59457e636eea..6ae429d37c8526342c3f3cb84f7122e0fb885d13 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
@@ -75,7 +75,7 @@ public class AttachmentsDropboxTest extends SystemTestCase
     public void testAttachmentsWithFailure() throws Exception
     {
         createData("failure");
-        waitUntilDataSetImportedWithError();
+        waitUntilDataSetImportedWithError("attachments-test");
         assertStreamsReleased(3);
     }
 
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
index fe7ffa0f0b04798280baa95cc4ee0f1add7e72c6..2ee22f4dc20121d18b16e2d196ec0469a2fb200a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
@@ -269,7 +269,7 @@ public abstract class SystemTestCase extends AssertJUnit
 
     }
 
-    protected void waitUntilDataSetImportedWithError() throws Exception
+    protected void waitUntilDataSetImportedWithError(String dropboxName) throws Exception
     {
         final int maxLoops = dataSetImportWaitDurationInSeconds();
 
@@ -278,7 +278,7 @@ public abstract class SystemTestCase extends AssertJUnit
             Thread.sleep(1000);
 
             String logContent = getLogAppender().getLogContent();
-            if (logContent.contains("ERROR"))
+            if (logContent.contains("ERROR") && logContent.contains(dropboxName))
             {
                 return;
             }