diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java
index 5b38bc7812..8725f3c9fc 100644
--- a/src/org/labkey/test/WebDriverWrapper.java
+++ b/src/org/labkey/test/WebDriverWrapper.java
@@ -22,6 +22,8 @@
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
+import org.assertj.core.api.Assertions;
+import org.awaitility.Awaitility;
 import org.eclipse.jetty.util.URIUtil;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.Contract;
@@ -1006,9 +1008,9 @@ public void switchToWindow(int index)
         try
         {
             getDriver().switchTo().window(windows.get(index));
-            new WebDriverWait(getDriver(), Duration.ofSeconds(WAIT_FOR_PAGE))
-                .withMessage("waiting for document to be ready")
-                .until(wd -> Objects.equals(executeScript("return document.readyState;"), "complete"));
+            Awaitility.await("waiting for document to be ready").atMost(Duration.ofMillis(WAIT_FOR_PAGE)).untilAsserted(() ->
+                Assertions.assertThat(executeScript("return document.readyState;"))
+                    .as("document.readyState").isIn("complete", "uninitialized")); // "uninitialized" for blank firefox tab
         }
         catch (StackOverflowError soe)
         {