diff --git a/src/test/java/org/alfresco/opencmis/BaseCMISTest.java b/src/test/java/org/alfresco/opencmis/BaseCMISTest.java
index ad881e6a65..abe2adc6c6 100644
--- a/src/test/java/org/alfresco/opencmis/BaseCMISTest.java
+++ b/src/test/java/org/alfresco/opencmis/BaseCMISTest.java
@@ -55,6 +55,7 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.After;
 import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 
@@ -194,5 +195,7 @@ public abstract class BaseCMISTest extends TestCase
             testTX.rollback();
         }
         super.tearDown();
+    
+        AuthenticationUtil.clearCurrentSecurityContext();
     }
 }
diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java b/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
index 821deb9638..57efd0b12d 100644
--- a/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
+++ b/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
@@ -394,7 +394,7 @@ public class DictionaryModelTypeTest extends BaseSpringTest
         this.actionService = (ActionService)this.applicationContext.getBean("actionService");
         this.transactionService = (TransactionService)this.applicationContext.getBean("transactionComponent");
 
-        // Authenticate as the admin user
+        // Authenticate as the admin user for dictionaryModelType
         AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
     
 
@@ -448,7 +448,7 @@ public class DictionaryModelTypeTest extends BaseSpringTest
     @After
     public void after() throws Exception
     {
-        authenticationService.clearCurrentSecurityContext();
+        AuthenticationUtil.clearCurrentSecurityContext();
     }
     
     /**
diff --git a/src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java b/src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java
index 00885a4994..62ec0110f2 100644
--- a/src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java
+++ b/src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java
@@ -200,7 +200,6 @@ public class ScriptNodeTest
     @Before public void createTestContent()
     {  
         excludedOnUpdateProps = VERSIONABLE_ASPECT.getExcludedOnUpdateProps();
-        
         AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
         // Create the store and get the root node
         storeRef = NODE_SERVICE.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis());
@@ -509,14 +508,15 @@ public class ScriptNodeTest
     public void testVersioningPropsDefaultChanged()
     {
         setUpBootstrap();
-        
-        // Authenticate as the system user
-        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
 
         TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
         {
             public Void execute() throws Throwable
             {
+                
+                // Authenticate as the system user
+                AuthenticationUtil.pushAuthentication();
+                AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
                 log.debug("Adding new model.");
 
                 // Create a model node
@@ -534,6 +534,8 @@ public class ScriptNodeTest
                 InputStream cmStream = getClass().getClassLoader().getResourceAsStream(TEST_CONTENT_MODEL);
                 contentWriter.putContent(IOUtils.toString(cmStream));
                 cmStream.close();
+                
+                AuthenticationUtil.popAuthentication();
                 return null;
             }
         });
diff --git a/src/test/java/org/alfresco/repo/usage/UserUsageTest.java b/src/test/java/org/alfresco/repo/usage/UserUsageTest.java
index 7e682aa259..64b2b288ae 100644
--- a/src/test/java/org/alfresco/repo/usage/UserUsageTest.java
+++ b/src/test/java/org/alfresco/repo/usage/UserUsageTest.java
@@ -63,7 +63,8 @@ import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.LogFactory;
+import org.junit.After;
 import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 
@@ -131,7 +132,8 @@ public class UserUsageTest extends TestCase
         repoAdminService = (RepoAdminService) applicationContext.getBean("repoAdminService");
         
         testTX = transactionService.getUserTransaction();
-        testTX.begin();
+        testTX.begin();
+        //Authenticate as the admin user
         AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
         
         // get default store (as configured for content usage service)
@@ -233,7 +235,9 @@ public class UserUsageTest extends TestCase
                 }
                 return null;
             }
-        }, true, true);
+        }, true, true);
+        
+       AuthenticationUtil.clearCurrentSecurityContext();
     }
     
     protected void runAs(String userName)
@@ -1053,5 +1057,11 @@ public class UserUsageTest extends TestCase
     private void takeOwnership(NodeRef nodeRef)
     {
         ownableService.takeOwnership(nodeRef);
+    }
+    
+    @After
+    public void after() throws Exception
+    {
+        AuthenticationUtil.popAuthentication();
     }
 }