diff --git a/luminex/test/src/org/labkey/test/tests/luminex/LuminexUploadAndLinkTest.java b/luminex/test/src/org/labkey/test/tests/luminex/LuminexUploadAndLinkTest.java
index 16bf0a09b..c14add2d2 100644
--- a/luminex/test/src/org/labkey/test/tests/luminex/LuminexUploadAndLinkTest.java
+++ b/luminex/test/src/org/labkey/test/tests/luminex/LuminexUploadAndLinkTest.java
@@ -240,6 +240,14 @@ public void testUploadAndLink()
         clickButton("Next", 60000);
         clickButton("Save and Finish");
 
+        // try forcing an immediate stats update to prompt a better query plan selection - hopefully avoids test timeouts
+        startSystemMaintenance("Database");
+        waitForSystemMaintenanceCompletion();
+
+        // return to the assay runs page
+        goToProjectHome(TEST_ASSAY_PRJ_LUMINEX);
+        clickAndWait(Locator.linkWithText(TEST_ASSAY_LUM));
+
         clickAndWait(Locator.linkWithText("raw and summary"), longWaitForPage);
         // make sure the Summary, StdDev, and DV columns are visible
         _customizeViewsHelper.openCustomizeViewPanel();