diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java b/source/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java
index 58f1ded3af..09a95480b8 100644
--- a/source/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java
@@ -25,6 +25,7 @@
 package org.alfresco.repo.web.scripts;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.util.PropertyMap;
@@ -54,6 +55,8 @@ public class RepositoryContainerTest extends BaseWebScriptTest
                 "AuthenticationService");
         this.personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
 
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+        
         // Create users
         createUser(USER_ONE);
     }
@@ -78,6 +81,7 @@ public class RepositoryContainerTest extends BaseWebScriptTest
     @Override
     protected void tearDown() throws Exception
     {
+        AuthenticationUtil.clearCurrentSecurityContext();
         super.tearDown();
     }
 
diff --git a/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java b/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
index 98fe24ba23..1b48d20ab7 100644
--- a/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
@@ -70,6 +70,8 @@ public class PersonServiceTest extends BaseWebScriptTest
         this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
         this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
         
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
         // Create users
         createUser(USER_ONE);
         createUser(USER_TWO);
diff --git a/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java b/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java
index 18e771920d..61744e34f1 100644
--- a/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java
@@ -61,6 +61,8 @@ public class PreferenceServiceTest extends BaseWebScriptTest
         this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
         this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
         
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
         // Create users
         createUser(USER_ONE);
         createUser(USER_BAD);
diff --git a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
index 2598549f9a..3e39ec4c65 100644
--- a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
@@ -84,6 +84,8 @@ public class SiteServiceTest extends BaseWebScriptTest
         this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
         this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
         
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
         // Create users
         createUser(USER_ONE);
         createUser(USER_TWO);
diff --git a/source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java b/source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
index da88576161..29f0268fc3 100644
--- a/source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
@@ -80,6 +80,8 @@ public class TaggingServiceTest extends BaseWebScriptTest
         this.repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper");
         this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
         
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
         // Add a load of tags ready to use
         this.taggingService.createTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_1);
         this.taggingService.createTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_2);
diff --git a/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java b/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
index 1ec1d04425..a6a75b5827 100644
--- a/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
@@ -29,6 +29,7 @@ import java.io.InputStream;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.web.scripts.BaseWebScriptTest;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileInfo;
@@ -69,6 +70,8 @@ public class ThumbnailServiceTest extends BaseWebScriptTest
         this.contentService = (ContentService)getServer().getApplicationContext().getBean("ContentService");
         this.repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper");
         
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+        
         this.testRoot = this.repositoryHelper.getCompanyHome();
         
         // Get test content