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 41016af573e48f39c2912f234057dacce619321a..d258265beeee431e822c5029bc84cbaa379b04e0 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
@@ -426,7 +426,7 @@ public class DatasetDownloadServletTest
                     one(response).setContentType("text/plain");
                     one(response).setContentLength(EXAMPLE_FILE_CONTENT.length());
                     one(response).setHeader("Content-Disposition",
-                            "inline; filename=" + EXAMPLE_FILE_NAME);
+                            "inline; filename=\"" + EXAMPLE_FILE_NAME + "\"");
                     one(response).getOutputStream();
                     will(returnValue(new ServletOutputStream()
                         {
@@ -486,7 +486,7 @@ public class DatasetDownloadServletTest
                     one(response).setContentLength(84);
                     one(response).addHeader("Cache-Control", "max-age=7200");
                     one(response).setHeader("Content-Disposition",
-                            "inline; filename=" + EXAMPLE_FILE_NAME);
+                            "inline; filename=\"" + EXAMPLE_FILE_NAME + "\"");
                     one(response).getOutputStream();
                     will(returnValue(new ServletOutputStream()
                         {