diff --git a/test/common/testlib.py b/test/common/testlib.py
index d8413800eaab..b7e91197d15c 100644
--- a/test/common/testlib.py
+++ b/test/common/testlib.py
@@ -905,10 +905,15 @@ def enter_page(self, path: str, host: str | None = None, reconnect: bool = True)
 
         self.switch_to_top()
 
+        def wait_no_curtain() -> None:
+            # Older shells make the curtain invisible, newer shells
+            # remove it entirely. Let's cater to both.
+            self.wait_js_cond('!ph_is_present(".curtains-ct") || !ph_is_visible(".curtains-ct")')
+
         while True:
             try:
                 self._wait_present("iframe.container-frame[name='%s'][data-loaded]" % frame)
-                self.wait_not_visible(".curtains-ct")
+                wait_no_curtain()
                 self.wait_visible("iframe.container-frame[name='%s']" % frame)
                 break
             except Error as ex:
@@ -916,7 +921,7 @@ def enter_page(self, path: str, host: str | None = None, reconnect: bool = True)
                     reconnect = False
                     if self.is_present("#machine-reconnect"):
                         self.click("#machine-reconnect")
-                        self.wait_not_visible(".curtains-ct")
+                        wait_no_curtain()
                         continue
                 raise