diff --git a/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/AbstractCmisTestCase.java b/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/AbstractCmisTestCase.java
index 4057e4951..abcbd0521 100644
--- a/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/AbstractCmisTestCase.java
+++ b/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/AbstractCmisTestCase.java
@@ -27,10 +27,6 @@
  */
 public abstract class AbstractCmisTestCase extends AbstractTestCase {
 
-	static {
-		System.setProperty("LOGICALDOC_REPOSITORY", "target");
-	}
-
 	@Override
 	public void setUp() throws IOException, SQLException, PluginException {
 		super.setUp();
diff --git a/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/MockCallContext.java b/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/MockCallContext.java
index c999c0aae..ff0dbf8ef 100644
--- a/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/MockCallContext.java
+++ b/logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/MockCallContext.java
@@ -105,7 +105,7 @@ public File getTempDirectory() {
 
 	@Override
 	public String getUsername() {
-		return "admin";
+		return username;
 	}
 
 	@Override
diff --git a/logicaldoc-util/src/main/java/com/logicaldoc/util/junit/AbstractTestCase.java b/logicaldoc-util/src/main/java/com/logicaldoc/util/junit/AbstractTestCase.java
index a5450bad3..7c323869b 100644
--- a/logicaldoc-util/src/main/java/com/logicaldoc/util/junit/AbstractTestCase.java
+++ b/logicaldoc-util/src/main/java/com/logicaldoc/util/junit/AbstractTestCase.java
@@ -55,6 +55,8 @@ public abstract class AbstractTestCase {
 
 	@Before
 	public void setUp() throws IOException, SQLException, PluginException {
+		System.setProperty("LOGICALDOC_REPOSITORY", "target");
+		
 		loadDevelSettings();
 
 		updateUserHome();