diff --git a/src/org/labkey/test/tests/AbstractQWPTest.java b/src/org/labkey/test/tests/AbstractQWPTest.java
index 8afe476252..87a978f191 100644
--- a/src/org/labkey/test/tests/AbstractQWPTest.java
+++ b/src/org/labkey/test/tests/AbstractQWPTest.java
@@ -20,6 +20,7 @@
 import org.labkey.test.Locator;
 import org.labkey.test.Locators;
 import org.labkey.test.WebTestHelper;
+import org.labkey.test.util.search.SearchAdminAPIHelper;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
@@ -60,6 +61,10 @@ protected void testQWPDemoPage()
 
         getTabSignalsPairs().stream().forEach(this::testQWPTab);
 
+        // Indexing 'sampleDataTest5k' holds locks that deadlock with the DROP TABLE, so let it finish first
+        sleep(2_000);
+        SearchAdminAPIHelper.waitForIndexer();
+
         log("Drop QWPDemo test data");
         beginAt(WebTestHelper.buildURL("simpletest", getProjectName(), "QWPDemo"));
         clickButton("Drop schema and clear test data"); // drop domain, needed for clean up project