diff --git a/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java b/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java
index 9fa281c934..69793cf139 100644
--- a/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java
+++ b/src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java
@@ -112,7 +112,7 @@ public void testUpload200kRows() throws Exception
         clickButton("Save and Finish");
 
         // wait for import complete
-        waitForPipelineJobsToComplete(1, "200k", false);
+        waitForPipelineJobsToComplete(1, "200k", false, 12 * 60000);
 
         // export assay1 data to excel
         log("exporting samples fields to excel");
@@ -133,7 +133,7 @@ public void testUpload200kRows() throws Exception
         setFormElement(Locator.input("__primaryFile__"), largeExportExcelFile);
         clickButton("Save and Finish");
 
-        waitForPipelineJobsToComplete(2, "200k take 2", false);
+        waitForPipelineJobsToComplete(2, "200k take 2", false, 12 * 60000);
 
         var qPage = SourceQueryPage.beginAt(this, getProjectName(), "assay.General.large_assay_2", "Data");
         var dataregion  = qPage.viewData(Duration.ofSeconds(60));
diff --git a/src/org/labkey/test/tests/component/EditableGridTest.java b/src/org/labkey/test/tests/component/EditableGridTest.java
index 46947f8e08..cddbef3a13 100644
--- a/src/org/labkey/test/tests/component/EditableGridTest.java
+++ b/src/org/labkey/test/tests/component/EditableGridTest.java
@@ -9,6 +9,7 @@
 import org.labkey.remoteapi.query.InsertRowsCommand;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
+import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.categories.Daily;
 import org.labkey.test.components.ui.grids.EditableGrid;
 import org.labkey.test.pages.test.CoreComponentsTestPage;
@@ -1444,7 +1445,12 @@ public void testPasteCellValidation()
             List<String> expectedWarnings = expectedCellWarnings.get(row);
             verifyCellWarning(testGrid, expectedWarnings, row);
         }
-        mouseOver(testGrid.getCell(0, STR_FIELD_NAME)); // dismiss warning popup
+
+        // Dismiss warning popup by moving off the grid.
+        mouseOver(Locator.tagWithClass("a", "brand-logo").findWhenNeeded(getDriver()));
+
+        WebDriverWrapper.waitFor(()->!Locator.tagWithClass("div", "popover").findWhenNeeded(getDriver()).isDisplayed(),
+                "Bad value popup did not go away.", 500);
 
         log("Correct missing required fields should remove corresponding cell warnings");
         testGrid.setCellValue(1, REQ_STR_FIELD_NAME + " *", " ");