diff --git a/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java b/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java
index 083fbc207d..ec03f8902c 100644
--- a/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java
+++ b/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java
@@ -93,7 +93,10 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
         {
             authenticationService.createAuthentication(USER_NAME, PWD.toCharArray());
         }
-                 
+             
+        // Authenticate - as admin
+        authenticationService.authenticate(USER_NAME, PWD.toCharArray());
+        
         // Store test messages in repo
         String pattern = "classpath*:" + BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME + "*";
         
@@ -109,9 +112,6 @@ public class MessageServiceImplTest extends BaseSpringTest implements MessageDep
                 addMessageResource(rootNodeRef, filename, resources[i].getInputStream());                
             }
         }
-        
-        // Authenticate
-        authenticationService.authenticate(USER_NAME, PWD.toCharArray());
     }
     
     private void addMessageResource(NodeRef rootNodeRef, String name, InputStream resourceStream) throws Exception