diff --git a/source/java/org/alfresco/repo/audit/AuditComponent.java b/source/java/org/alfresco/repo/audit/AuditComponent.java
index 93c581944a..516913b3bc 100644
--- a/source/java/org/alfresco/repo/audit/AuditComponent.java
+++ b/source/java/org/alfresco/repo/audit/AuditComponent.java
@@ -178,8 +178,6 @@ public interface AuditComponent
      * @return                  Returns the values that were actually persisted, keyed by their full path.
      * @throws IllegalStateException if there is not a writable transaction present
      * 
-     * @see #startAuditSession()
-     * 
      * @since 3.2
      */
     Map<String, Serializable> recordAuditValues(String rootPath, Map<String, Serializable> values);
diff --git a/source/java/org/alfresco/repo/audit/AuditComponentTest.java b/source/java/org/alfresco/repo/audit/AuditComponentTest.java
index 9c46fa6238..8c26a3a002 100644
--- a/source/java/org/alfresco/repo/audit/AuditComponentTest.java
+++ b/source/java/org/alfresco/repo/audit/AuditComponentTest.java
@@ -72,7 +72,7 @@ public class AuditComponentTest extends TestCase
 {
     private static final String APPLICATION_TEST = "Alfresco Test";
     private static final String APPLICATION_ACTIONS_TEST = "Actions Test";
-    private static final String APPLICATION_API_TEST = "API Test";
+    private static final String APPLICATION_API_TEST = "Test AuthenticationService";
     
     private static final Log logger = LogFactory.getLog(AuditComponentTest.class);
     
@@ -454,12 +454,10 @@ public class AuditComponentTest extends TestCase
     
     public void testAuditAuthenticationService() throws Exception
     {
-        final Map<String, Serializable> expected = new HashMap<String, Serializable>();
-        expected.put("/actions-test/actions/user", AuthenticationUtil.getFullyAuthenticatedUser());
-        expected.put("/actions-test/actions/context-node/noderef", nodeRef);
-        expected.put("/actions-test/actions/action-01/params/A/value", null);
-        expected.put("/actions-test/actions/action-01/params/B/value", null);
-        expected.put("/actions-test/actions/action-01/params/C/value", null);
+        // Load in the config for this specific test: alfresco-audit-test-authenticationservice.xml
+        URL testModelUrl = ResourceUtils.getURL("classpath:alfresco/audit/alfresco-audit-test-authenticationservice.xml");
+        auditModelRegistry.registerModel(testModelUrl);
+        auditModelRegistry.loadAuditModels();
         
         final List<Map<String, Serializable>> results = new ArrayList<Map<String,Serializable>>();
         final StringBuilder sb = new StringBuilder();
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test-authenticationservice.xml b/source/test-resources/alfresco/audit/alfresco-audit-test-authenticationservice.xml
new file mode 100644
index 0000000000..0ec3a4ecb0
--- /dev/null
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test-authenticationservice.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Default Audit Configuration -->
+
+<Audit
+    xmlns="http://www.alfresco.org/repo/audit/model/3.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.alfresco.org/repo/audit/model/3.2 alfresco-audit-3.2.xsd"
+    >
+
+    <DataExtractors>
+       <DataExtractor name="simpleValue" registeredName="auditModel.extractor.simpleValue"/>
+    </DataExtractors>
+
+    <PathMappings>
+        <PathMap source="/alfresco-api" target="/test-authenticationservice"/>
+    </PathMappings>
+
+    <Application name="Test AuthenticationService" key="test-authenticationservice">
+        <AuditPath key="post">
+            <AuditPath key="AuthenticationService">
+                <AuditPath key="authenticate">
+                    <AuditPath key="args">
+                        <AuditPath key="userName">
+                            <RecordValue key="value" dataExtractor="simpleValue"/>
+                        </AuditPath>
+                    </AuditPath>
+                    <AuditPath key="error">
+                        <RecordValue key="value" dataExtractor="simpleValue"/>
+                    </AuditPath>
+                </AuditPath>
+            </AuditPath>
+        </AuditPath>
+    </Application>
+
+</Audit>
diff --git a/source/test-resources/alfresco/audit/alfresco-audit-test.xml b/source/test-resources/alfresco/audit/alfresco-audit-test.xml
index 86d94a4437..4fee4a1ce7 100644
--- a/source/test-resources/alfresco/audit/alfresco-audit-test.xml
+++ b/source/test-resources/alfresco/audit/alfresco-audit-test.xml
@@ -24,7 +24,6 @@
         <PathMap source="/test/one.one/two.two" target="/test/1.1/2.2"/>
         <PathMap source="/actions-test" target="/actions-test"/>
         <PathMap source="/actions-test/actions/action-01-mapped" target="/actions-test/actions/action-01"/>
-        <PathMap source="/alfresco-api" target="/api-test"/>
     </PathMappings>
 
     <Application name="Alfresco Test" key="test">
@@ -96,21 +95,4 @@
         </AuditPath>
     </Application>
 
-    <Application name="API Test" key="api-test">
-        <AuditPath key="post">
-	        <AuditPath key="AuthenticationService">
-	            <AuditPath key="authenticate">
-	                <AuditPath key="args">
-	                    <AuditPath key="userName">
-	                        <RecordValue key="value" dataExtractor="simpleValue"/>
-	                    </AuditPath>
-	                </AuditPath>
-	                <AuditPath key="error">
-                        <RecordValue key="value" dataExtractor="simpleValue"/>
-	                </AuditPath>
-	            </AuditPath>
-	        </AuditPath>
-	    </AuditPath>
-    </Application>
-
 </Audit>
\ No newline at end of file