diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java
index 9710e18a78694dfe983987a884c548bd676405bc..e0f43f500784a3f0c77cd47172e084e83b42e632 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java
@@ -245,7 +245,7 @@ public class DataStoreServiceTest extends AssertJUnit
             fail("InvalidSessionException expected");
         } catch (InvalidSessionException e)
         {
-            assertEquals("User couldn't be authenticated at CIFEX.", e.getMessage());
+            assertEquals("User failed to be authenticated by CIFEX.", e.getMessage());
         }
 
         context.assertIsSatisfied();
@@ -267,6 +267,7 @@ public class DataStoreServiceTest extends AssertJUnit
 
                     one(cifex).login(uploadContext.getUserID(), uploadContext.getPassword());
                     will(returnValue("token"));
+                    one(cifex).logout("token");
 
                     one(commandExecutor).scheduleUploadingDataSetsToCIFEX(cifexServiceFactory,
                             mailClientParameters, dataSets, uploadContext, null, null);