diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java
index edd338e62e87a8bfae9a42d9b08f3f078d5565eb..0d6f6825031a16f25e3713b33549ea56bbf90eda 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java
@@ -33,7 +33,7 @@ import javax.imageio.ImageIO;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.testng.AssertJUnit;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
 
 import ch.ethz.sis.openbis.generic.shared.api.v3.IApplicationServerApi;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
@@ -459,7 +459,7 @@ public abstract class AbstractScreeningSystemTestCase extends SystemTestCase
 
     protected IApplicationServerApi v3api;
 
-    @BeforeTest
+    @BeforeMethod
     public void setUpServices()
     {
         commonServer = (ICommonServer) applicationContext