diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
index eeddbc7515494cd81e834876f2069bcded9b3aa1..cb2b770eeb597f4b0a197c1cf643b741c7e93693 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
@@ -365,11 +365,11 @@ public class DatasetDownloadServletTest
DatasetDownloadServlet servlet = createServlet();
servlet.doGet(request, response);
- assertContains("<html><body><h1>Error</h1>" + OSUtilities.LINE_SEPARATOR
+ AssertionUtil.assertContainsLines("<html><body><h1>Error</h1>" + OSUtilities.LINE_SEPARATOR
+ "Unknown data set: 1234-1" + OSUtilities.LINE_SEPARATOR + "</body></html>"
+ OSUtilities.LINE_SEPARATOR, writer.toString());
String logContent = logRecorder.getLogContent();
- assertContains(getSessionCreationLogMessage() + OSUtilities.LINE_SEPARATOR
+ AssertionUtil.assertContainsLines(getSessionCreationLogMessage() + OSUtilities.LINE_SEPARATOR
+ CONTENT_PROVIDER_LOG_ERROR + "Data set '1234-1' not found in openBIS server."
+ OSUtilities.LINE_SEPARATOR + LOG_ERROR + "Unknown data set: 1234-1",
logContent);