diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.java
index 86f16f4b4f78f4135030365450ff3e790ae108eb..cbc896f6b7a6f1c51eec3dc8dc317ce9fc6c2398 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.java
@@ -25,6 +25,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
@@ -86,7 +87,7 @@ public class EntityOperationTest extends SystemTestCase
 
     private static final SpaceIdentifier SPACE_B = new SpaceIdentifier("TESTGROUP");
 
-    @BeforeClass
+    @BeforeMethod
     public void createTestUsers()
     {
         systemSessionToken = commonServer.tryToAuthenticateAsSystem().getSessionToken();