diff --git a/source/java/org/alfresco/repo/lock/LockBehaviourImplTest.java b/source/java/org/alfresco/repo/lock/LockBehaviourImplTest.java
index 79153b2df7..81a150cf88 100644
--- a/source/java/org/alfresco/repo/lock/LockBehaviourImplTest.java
+++ b/source/java/org/alfresco/repo/lock/LockBehaviourImplTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.service.cmr.lock.LockService;
 import org.alfresco.service.cmr.lock.LockType;
 import org.alfresco.service.cmr.lock.NodeLockedException;
@@ -92,7 +93,10 @@ public class LockBehaviourImplTest extends BaseSpringTest
 		this.versionService = (VersionService)applicationContext.getBean("versionService");
         this.authenticationService = (AuthenticationService)applicationContext.getBean("authenticationService");
         this.permissionService = (PermissionService)applicationContext.getBean("permissionService");
-        authenticationService.clearCurrentSecurityContext();
+        
+        // Set the authentication
+        AuthenticationComponent authComponent = (AuthenticationComponent)this.applicationContext.getBean("authenticationComponent");
+        authComponent.setSystemUserAsCurrentUser();
         
         // Create the node properties
         HashMap<QName, Serializable> nodeProperties = new HashMap<QName, Serializable>();
diff --git a/source/java/org/alfresco/repo/lock/LockServiceImplTest.java b/source/java/org/alfresco/repo/lock/LockServiceImplTest.java
index 88e7e55d1a..ed37cee449 100644
--- a/source/java/org/alfresco/repo/lock/LockServiceImplTest.java
+++ b/source/java/org/alfresco/repo/lock/LockServiceImplTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.service.cmr.lock.LockService;
 import org.alfresco.service.cmr.lock.LockStatus;
 import org.alfresco.service.cmr.lock.LockType;
@@ -71,7 +72,10 @@ public class LockServiceImplTest extends BaseSpringTest
         this.nodeService = (NodeService)applicationContext.getBean("dbNodeService");
         this.lockService = (LockService)applicationContext.getBean("lockService");
         this.authenticationService = (AuthenticationService)applicationContext.getBean("authenticationService");
-        authenticationService.clearCurrentSecurityContext();
+        
+        // Set the authentication
+        AuthenticationComponent authComponent = (AuthenticationComponent)this.applicationContext.getBean("authenticationComponent");
+        authComponent.setSystemUserAsCurrentUser();        
         
         // Create the node properties
         HashMap<QName, Serializable> nodeProperties = new HashMap<QName, Serializable>();