diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
index 991920a3d3..f803f98ef4 100644
--- a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
@@ -199,7 +199,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         }
         
         users.clear();
-
+        AuthenticationUtil.clearCurrentSecurityContext();
         setRequestContext(null);
     }
 
diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java
index 1976edd58e..a66c62195f 100644
--- a/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java
@@ -645,7 +645,6 @@ public class NodeAssociationsApiTest extends AbstractSingleNetworkSiteTest
         finally
         {
             // some cleanup
-            AuthenticationUtil.clearCurrentSecurityContext();
             setRequestContext(user1);
             deleteNode(u1f1Id, true, 204);
             deleteNode(sf1Id, true, 204);