diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java
index d756c838b3..e2ed0a01de 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java
@@ -65,8 +65,11 @@ public class CreateRecordActionTest extends BaseRMTestCase
     {
         // Testing
         AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO");
-        assertTrue(authDao.authorityExists(AuthenticationUtil.getSystemUserName()));
-        assertFalse(true);
+        if (authDao.authorityExists(AuthenticationUtil.getSystemUserName()) == false)
+        {
+            createPerson(AuthenticationUtil.getSystemUserName(), false);
+        }
+        assertTrue("No person object for System available.", authDao.authorityExists(AuthenticationUtil.getSystemUserName()));
         
         super.setupTestDataImpl();
     }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
index 5f8d710b51..476c47d5b3 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
@@ -582,13 +582,21 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
      * @param userName  user name
      * @return NodeRef  user node reference
      */
-    protected NodeRef createPerson(String userName)
+    protected NodeRef createPerson(String userName, boolean createAuth)
     {
-        authenticationService.createAuthentication(userName, "password".toCharArray());
+        if (createAuth == true)
+        {
+            authenticationService.createAuthentication(userName, "password".toCharArray());
+        }
         Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
         properties.put(ContentModel.PROP_USERNAME, userName);
         return personService.createPerson(properties);
     }
+    
+    protected NodeRef createPerson(String userName)
+    {
+        return createPerson(userName, true);
+    }
 
     /**
      * Setup multi hierarchy test data