diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
index 38d09f60cb6de23b64059c8871bf882e284743bd..823cd013dd139519c5bb57a7633bb98e348c64f1 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
@@ -247,9 +247,10 @@ public class UploadingCommandTest extends AssertJUnit
         File[] emails = EMAILS.listFiles();
         assertEquals("One email expected", 1, emails.length);
         List<String> email = FileUtilities.loadToStringList(emails[0]);
-        assertEquals("Subj: [Data Set Server] Uploading failed", email.get(0));
         assertEquals("From: a@bc.de", email.get(1));
-        assertEquals("To:   user@bc.de", email.get(2));
+        assertEquals("To: user@bc.de", email.get(2));
+        assertEquals("Subject: [Data Set Server] Uploading failed", email.get(3));
+
         assertTrue("Actual: " + email.get(5), email.get(5).startsWith(messageStart));
     }