diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java
index 9265531132..7c55b2b958 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java
@@ -82,101 +82,116 @@ public class DeleteHoldTest extends BaseRMTestCase
 
     public void testDeleteHoldBehaviourForRecordFolder()
     {
+        NodeRef hold1 = doTestInTransaction(new Test<NodeRef>()
+        {
+            @Override
+            public NodeRef run() throws Exception
+            {
+                // create test holds
+                return createAndCheckHold();
+            }
+        });
+        //Splitting transaction to fix onCreateNodePolicy issue where there was a node not found exception
         doTestInTransaction(new Test<Void>()
         {
-           @Override
-           public Void run() throws Exception
-           {
-               // create test holds
-               NodeRef hold1 = createAndCheckHold();
+            @Override
+            public Void run() throws Exception
+            {
+                // add the record folder to hold1
+                holdService.addToHold(hold1, rmFolder);
 
-               // add the record folder to hold1
-               holdService.addToHold(hold1, rmFolder);
+                // assert that the folder and records are frozen
+                assertTrue(freezeService.isFrozen(rmFolder));
+                assertTrue(freezeService.isFrozen(recordOne));
+                assertTrue(freezeService.isFrozen(recordDeclaredOne));
 
-               // assert that the folder and records are frozen
-               assertTrue(freezeService.isFrozen(rmFolder));
-               assertTrue(freezeService.isFrozen(recordOne));
-               assertTrue(freezeService.isFrozen(recordDeclaredOne));
+                // check the contents of the hold
+                List<NodeRef> frozenNodes = holdService.getHeld(hold1);
+                assertNotNull(frozenNodes);
+                assertEquals(1, frozenNodes.size());
+                assertEquals(rmFolder, frozenNodes.get(0));
 
-               // check the contents of the hold
-               List<NodeRef> frozenNodes = holdService.getHeld(hold1);
-               assertNotNull(frozenNodes);
-               assertEquals(1, frozenNodes.size());
-               assertEquals(rmFolder, frozenNodes.get(0));
+                // delete the hold
+                holdService.deleteHold(hold1);
 
-               // delete the hold
-               holdService.deleteHold(hold1);
+                // assert that the folder and records no longer frozen
+                assertFalse(freezeService.isFrozen(rmFolder));
+                assertFalse(freezeService.isFrozen(recordOne));
+                assertFalse(freezeService.isFrozen(recordDeclaredOne));
 
-               // assert that the folder and records no longer frozen
-               assertFalse(freezeService.isFrozen(rmFolder));
-               assertFalse(freezeService.isFrozen(recordOne));
-               assertFalse(freezeService.isFrozen(recordDeclaredOne));
+                // confirm the hold has been deleted
+                assertNull(holdService.getHold(filePlan, "hold one"));
 
-               // confirm the hold has been deleted
-               assertNull(holdService.getHold(filePlan, "hold one"));
-
-               return null;
-           }
+                return null;
+            }
         });
     }
 
     public void testDeleteHoldBehaviourForMultipleHolds()
     {
+        List<NodeRef> holds = doTestInTransaction(new Test<List<NodeRef>>()
+        {
+            @Override
+            public List<NodeRef> run() throws Exception
+            {
+                // create test holds
+                return createAndCheckHolds();
+            }
+        });
+        //Splitting transaction to fix onCreateNodePolicy issue where there was a node not found exception
         doTestInTransaction(new Test<Void>()
         {
-           @Override
-           public Void run() throws Exception
-           {
-               // create test holds
-               List<NodeRef> holds = createAndCheckHolds();
-               NodeRef hold1 = holds.get(0);
-               NodeRef hold2 = holds.get(1);
+            @Override
+            public Void run() throws Exception
+            {
+                NodeRef hold1 = holds.get(0);
+                NodeRef hold2 = holds.get(1);
 
-               // add the record folder to hold1
-               holdService.addToHold(hold1, rmFolder);
+                // add the record folder to hold1
+                holdService.addToHold(hold1, rmFolder);
 
-               // assert that the folder and records are frozen
-               assertTrue(freezeService.isFrozen(rmFolder));
-               assertTrue(freezeService.isFrozen(recordOne));
-               assertTrue(freezeService.isFrozen(recordDeclaredOne));
+                // assert that the folder and records are frozen
+                assertTrue(freezeService.isFrozen(rmFolder));
+                assertTrue(freezeService.isFrozen(recordOne));
+                assertTrue(freezeService.isFrozen(recordDeclaredOne));
 
-               // check the contents of the hold
-               List<NodeRef> frozenNodes = holdService.getHeld(hold1);
-               assertNotNull(frozenNodes);
-               assertEquals(1, frozenNodes.size());
-               assertEquals(rmFolder, frozenNodes.get(0));
+                // check the contents of the hold
+                List<NodeRef> frozenNodes = holdService.getHeld(hold1);
+                assertNotNull(frozenNodes);
+                assertEquals(1, frozenNodes.size());
+                assertEquals(rmFolder, frozenNodes.get(0));
 
-               holdService.addToHold(hold2, recordOne);
+                holdService.addToHold(hold2, recordOne);
 
-               // assert that the folder and records are frozen
-               assertTrue(freezeService.isFrozen(rmFolder));
-               assertTrue(freezeService.isFrozen(recordOne));
-               assertTrue(freezeService.isFrozen(recordDeclaredOne));
+                // assert that the folder and records are frozen
+                assertTrue(freezeService.isFrozen(rmFolder));
+                assertTrue(freezeService.isFrozen(recordOne));
+                assertTrue(freezeService.isFrozen(recordDeclaredOne));
 
-               // delete the hold
-               holdService.deleteHold(hold1);
+                // delete the hold
+                holdService.deleteHold(hold1);
 
-               // assert that the folder and records no longer frozen
-               assertFalse(freezeService.isFrozen(rmFolder));
-               assertTrue(freezeService.isFrozen(recordOne));
-               assertFalse(freezeService.isFrozen(recordDeclaredOne));
+                // assert that the folder and records no longer frozen
+                assertFalse(freezeService.isFrozen(rmFolder));
+                assertTrue(freezeService.isFrozen(recordOne));
+                assertFalse(freezeService.isFrozen(recordDeclaredOne));
 
-               // confirm the hold has been deleted
-               assertNull(holdService.getHold(filePlan, "hold one"));
+                // confirm the hold has been deleted
+                assertNull(holdService.getHold(filePlan, "hold one"));
 
-               // delete the hold
-               holdService.deleteHold(hold2);
+                // delete the hold
+                holdService.deleteHold(hold2);
 
-               // assert that the folder and records no longer frozen
-               assertFalse(freezeService.isFrozen(rmFolder));
-               assertFalse(freezeService.isFrozen(recordOne));
-               assertFalse(freezeService.isFrozen(recordDeclaredOne));
+                // assert that the folder and records no longer frozen
+                assertFalse(freezeService.isFrozen(rmFolder));
+                assertFalse(freezeService.isFrozen(recordOne));
+                assertFalse(freezeService.isFrozen(recordDeclaredOne));
 
-               // confirm the hold has been deleted
-               assertNull(holdService.getHold(filePlan, "hold two"));
+                // confirm the hold has been deleted
+                assertNull(holdService.getHold(filePlan, "hold two"));
 
-               return null;
-           }
+                return null;
+            }
         });
     }