diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java
index dc5184897b29301fdb9fa8eed9e7f5f92df675e7..ce2cc5e186bb226e18ad3c282d0df816820be954 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java
@@ -60,8 +60,7 @@ public abstract class ByPoliceAbstractTest extends AbstractAutoArchiverPolicyTes
         pathProviderMock = ServiceProviderTestWrapper.mock(context, IDataSetPathInfoProvider.class);
         singleDsProviderMock = ServiceProviderTestWrapper.mock(context, ISingleDataSetPathInfoProvider.class);
 
-        ServiceProviderTestWrapper.addMock(context, IDataSetPathInfoProvider.class,
-                pathProviderMock);
+        ServiceProviderTestWrapper.addMock(context, IDataSetPathInfoProvider.class, pathProviderMock);
 
     }
 
@@ -94,11 +93,11 @@ public abstract class ByPoliceAbstractTest extends AbstractAutoArchiverPolicyTes
             });
     }
 
-    @AfterMethod
+    @AfterMethod(alwaysRun = true)
     public void checkMockExpectations(ITestResult result)
     {
-        context.assertIsSatisfied();
         ServiceProviderTestWrapper.restoreApplicationContext();
+        context.assertIsSatisfied();
     }
 
 
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java
index b4ad4044c740935667fe15439a6a1592010ccd56..44caed7aa3fa70aae06bd34dfc6aed5e793a3731 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java
@@ -341,9 +341,9 @@ public class AbstractArchiverProcessingPluginTest extends AbstractFileSystemTest
     @AfterMethod
     public void afterMethod()
     {
+        ServiceProviderTestWrapper.restoreApplicationContext();
         logRecorder.reset();
         context.assertIsSatisfied();
-        ServiceProviderTestWrapper.restoreApplicationContext();
     }
 
     @Test
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java
index 4522fcaa1805af9d503bf228a3ecd488fa193278..57867d1a8692eb21997fcce90efc9bae0fdb3723 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java
@@ -103,6 +103,7 @@ public class MultiDataSetArchiveCleanerTest extends AbstractFileSystemTestCase
     @AfterMethod
     public void checkMockExpectations(ITestResult result)
     {
+        ServiceProviderTestWrapper.restoreApplicationContext();
         if (result.getStatus() == ITestResult.FAILURE)
         {
             fail(result.getName() + " failed. Log content:\n" + logRecorder.getLogContent());
@@ -111,8 +112,6 @@ public class MultiDataSetArchiveCleanerTest extends AbstractFileSystemTestCase
         // To following line of code should also be called at the end of each test method.
         // Otherwise one does not known which test failed.
         context.assertIsSatisfied();
-
-        ServiceProviderTestWrapper.restoreApplicationContext();
     }
 
     @Test
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 a2425538bd5fef6b2d9598a3c3a625405f7f73a3..81ecb6b20ccc93176c7038f96a4bafc606a1dfcc 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,9 +547,10 @@ public class MultiDataSetArchiverTest extends AbstractFileSystemTestCase
             });
     }
 
-    @AfterMethod
+    @AfterMethod(alwaysRun = true)
     public void checkMockExpectations(ITestResult result)
     {
+        ServiceProviderTestWrapper.restoreApplicationContext();
         if (result.getStatus() == ITestResult.FAILURE)
         {
             String logContent = getLogContent();
@@ -559,8 +560,6 @@ public class MultiDataSetArchiverTest extends AbstractFileSystemTestCase
         // To following line of code should also be called at the end of each test method.
         // Otherwise one does not known which test failed.
         context.assertIsSatisfied();
-
-        ServiceProviderTestWrapper.restoreApplicationContext();
     }
 
     @Test
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java
index 61e371d8951a6f8036955545117356525a8e3d2c..fd3aabc8c6e8698c34eaffb6aa0039756ba94996 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java
@@ -152,6 +152,7 @@ public class MultiDataSetArchivingFinalizerTest extends AbstractFileSystemTestCa
     @AfterMethod
     public void checkMockExpectations(ITestResult result)
     {
+        ServiceProviderTestWrapper.restoreApplicationContext();
         if (result.getStatus() == ITestResult.FAILURE)
         {
             String logContent = logRecorder.getLogContent();
@@ -161,8 +162,6 @@ public class MultiDataSetArchivingFinalizerTest extends AbstractFileSystemTestCa
         // To following line of code should also be called at the end of each test method.
         // Otherwise one does not known which test failed.
         context.assertIsSatisfied();
-
-        ServiceProviderTestWrapper.restoreApplicationContext();
     }
 
     @Test
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 242e94af3e3cd9c1349f06a3c1f9cc1b663ed915..8bb793bb90899e08f2649e31bbf75e4d65f7af67 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,9 +176,10 @@ public class MultiDataSetUnarchivingMaintenanceTaskTest extends AssertJUnit
             });
     }
 
-    @AfterMethod
+    @AfterMethod(alwaysRun = true)
     public void checkMockExpectations(ITestResult result)
     {
+        ServiceProviderTestWrapper.restoreApplicationContext();
         if (result.getStatus() == ITestResult.FAILURE)
         {
             String logContent = logRecorder.getLogContent();
@@ -188,8 +189,6 @@ public class MultiDataSetUnarchivingMaintenanceTaskTest extends AssertJUnit
         // To following line of code should also be called at the end of each test method.
         // Otherwise one does not known which test failed.
         context.assertIsSatisfied();
-
-        ServiceProviderTestWrapper.restoreApplicationContext();
     }
 
     @Test