diff --git a/src/org/labkey/test/tests/TriggerScriptTest.java b/src/org/labkey/test/tests/TriggerScriptTest.java
index 0fc7599c84..2b4e2305ea 100644
--- a/src/org/labkey/test/tests/TriggerScriptTest.java
+++ b/src/org/labkey/test/tests/TriggerScriptTest.java
@@ -44,6 +44,7 @@
 import org.labkey.test.util.Maps;
 import org.labkey.test.util.PortalHelper;
 import org.labkey.test.util.exp.SampleTypeAPIHelper;
+import org.labkey.test.util.search.SearchAdminAPIHelper;
 import org.openqa.selenium.Alert;
 
 import java.io.IOException;
@@ -585,6 +586,8 @@ private void doAPITriggerTest(String schemaName, String queryName, String keyCol
         row2 = resp.getRows().get(0);
         Assert.assertEquals("API BeforeInsert", row2.get(COUNTRY_FIELD));
 
+        SearchAdminAPIHelper.waitForIndexer();
+
         row3 = resp.getRows().get(1);
 
         //Check Before Update Event
@@ -602,6 +605,8 @@ private void doAPITriggerTest(String schemaName, String queryName, String keyCol
         //Check update persisted
         Assert.assertEquals("BeforeUpdate", updateCo.get(flagField));
 
+        SearchAdminAPIHelper.waitForIndexer();
+
         //Check After Update Event
         step = "AfterUpdate";
         log("** " + testName + " " + step + " Event");