diff --git a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
index 29320bc5..a9a5c63c 100644
--- a/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
+++ b/nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
@@ -819,6 +819,7 @@ public void testClinicalCasesWorkflow()
         _helper.setDataEntryField("remark", "Clinical Remarks - Test");
         if (null == _helper.getExt4FieldForFormSection("Clinical Remarks", "Remark").getValue())
             _helper.setDataEntryField("remark", "Clinical Remarks - Test");
+        sleep(750);
         waitForTextToDisappear("Remark: WARN: Must enter at least one comment");
 
         Ext4GridRef weight = _helper.getExt4GridForFormSection("Weights");
@@ -839,6 +840,7 @@ public void testClinicalCasesWorkflow()
         orderGrid.clickDownArrowOnGrid(1, "orderedby");
         orderGrid.setGridCell(1, "orderedby", NIRC_VET_NAME);
         orderGrid.completeEdit();
+        sleep(1_000);
         submitForm("Submit Final", "Finalize Form");
 
         log("Completing today's Medication Schedule");
@@ -863,7 +865,7 @@ public void testClinicalCasesWorkflow()
         impersonate(NIRC_FULL_SUBMITTER_VET);
 
         //Go to 'Active Clinical Cases'
-        clickAndWait(Locator.linkWithText("Active Clinical Cases"));
+        waitAndClickAndWait(Locator.linkWithText("Active Clinical Cases"));
 
         //Click on 'Case Update' link
         AnimalHistoryPage historyPage = new AnimalHistoryPage<>(getDriver());