diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index dc0247a135..a927bde1cb 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -145,6 +145,7 @@
                 <entry key="org.alfresco.repo.security.permissions.AccessDeniedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_FORBIDDEN}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_METHOD_NOT_ALLOWED}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
+                <entry key="org.alfresco.service.cmr.lock.NodeLockedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.StaleEntityException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.RequestEntityTooLargeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_REQUEST_ENTITY_TOO_LARGE}" />
                 <entry key="org.alfresco.rest.framework.core.exceptions.DisabledServiceException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_IMPLEMENTED}" />
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestNodeComments.java b/source/test-java/org/alfresco/rest/api/tests/TestNodeComments.java
index d752b10f89..238359a518 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestNodeComments.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestNodeComments.java
@@ -803,35 +803,33 @@ public class TestNodeComments extends EnterpriseTestApi
 			}
 			catch(PublicApiException e)
 			{
-				assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+				assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
 			}
 
 			// test PUT for a locked node
+			try
 			{
-				TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
-				{
-					@Override
-					public Void doWork() throws Exception
-					{
-						repoService.lockNode(nodeRef1);
-						return null;
-					}
-				}, person11.getId(), network1.getId());
+				Comment updatedComment = new Comment();
+				updatedComment.setContent("my comment");
+				commentsProxy.updateNodeComment(nodeRef1.getId(), createdComment.getId(), updatedComment);
 				
-				try
-				{
-					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+			}
 
-					Comment updatedComment = new Comment();
-					updatedComment.setContent("my comment");
-					commentsProxy.updateNodeComment(nodeRef1.getId(), createdComment.getId(), updatedComment);
-					
-					fail("");
-				}
-				catch(PublicApiException e)
-				{
-					assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
-				}
+			// test DELETE for a locked node
+			try
+			{
+				commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId());
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
 			}
 		}
 		finally