diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
index b25c7df0c3..c87c83d78f 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
@@ -187,7 +187,15 @@ public class CommonRMTestUtils implements RecordsManagementModel
             @Override
             public Void doWork() throws Exception
             {
-                actionService.executeRecordsManagementAction(recordFolder, "closeRecordFolder");            
+                modelSecurityService.setEnabled(false);
+                try
+                {
+                    actionService.executeRecordsManagementAction(recordFolder, "closeRecordFolder");
+                }
+                finally
+                {
+                    modelSecurityService.setEnabled(true);
+                }
                 return null;
             }
         }, AuthenticationUtil.getAdminUserName());
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java
index 7a6521d4ed..3afdca51e1 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java
@@ -339,7 +339,10 @@ public class DispositionRestApiTest extends BaseRMWebScriptTestCase implements R
         // Test 404 for disposition lifecycle request on incorrect node
         String categoryUrl = recordCategory.toString().replace("://", "/");
         String requestUrl = MessageFormat.format(GET_LIFECYCLE_URL_FORMAT, categoryUrl);
-        Response rsp = sendRequest(new GetRequest(requestUrl), 404);
+        Response rsp = sendRequest(new GetRequest(requestUrl), 200);
+        
+        JSONObject notFound = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        assertEquals(true, notFound.getJSONObject("data").getBoolean("notFound"));
         
         NodeRef newRecordFolder = rmService.createRecordFolder(recordCategory, "recordFolder");
      
@@ -428,7 +431,7 @@ public class DispositionRestApiTest extends BaseRMWebScriptTestCase implements R
         JSONObject periodProperties = data.getJSONObject("periodProperties");
         assertEquals(SERVICE_URL_PREFIX + GET_LIST_URL + "/periodproperties", periodProperties.getString("url"));
         items = periodProperties.getJSONArray("items");
-        assertEquals(4, items.length());
+        assertEquals(5, items.length());
         assertTrue(items.length() > 0);
         item = items.getJSONObject(0);
         assertTrue(item.length() == 2);