diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
index 81ecb6b20ccc93176c7038f96a4bafc606a1dfcc..09d71180c60558c1f06b4d833b85490113b0b27f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
@@ -547,7 +547,7 @@ public class MultiDataSetArchiverTest extends AbstractFileSystemTestCase
             });
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterMethod
     public void checkMockExpectations(ITestResult result)
     {
         ServiceProviderTestWrapper.restoreApplicationContext();
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
index 8bb793bb90899e08f2649e31bbf75e4d65f7af67..940a48669ac1371e2e393d8440d8c8637494c8fd 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
@@ -176,7 +176,7 @@ public class MultiDataSetUnarchivingMaintenanceTaskTest extends AssertJUnit
             });
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterMethod
     public void checkMockExpectations(ITestResult result)
     {
         ServiceProviderTestWrapper.restoreApplicationContext();