diff --git a/common/src/web/dragAndDropTest.html b/common/src/web/dragAndDropTest.html
index fdee16b0b4ebe..db0e1bd1cb9c7 100644
--- a/common/src/web/dragAndDropTest.html
+++ b/common/src/web/dragAndDropTest.html
@@ -4,6 +4,7 @@
 <style>
 <!--
 .dragme{position:relative;}
+.hidden{visibility: hidden;}
 -->
 </style>
 <script language="JavaScript1.2">
@@ -83,20 +84,23 @@
   }
 }
 
-document.onmousedown=selectmouse;
-document.onmouseup=new Function("isdrag=false");
+document.onmousedown = selectmouse;
+document.onmouseup = new Function("isdrag=false");
+document.querySelectorAll('.hidden').forEach(item => {
+  item.classList.remove('hidden');
+})
 
 //-->
 </script>
 
 
 
-<img src="icon.gif" class="dragme" id="test1"><br>
-<img src="icon.gif" class="dragme" id="test2"><br>
+<img src="icon.gif" class="dragme hidden" id="test1"><br>
+<img src="icon.gif" class="dragme hidden" id="test2"><br>
 <b>"Hi there</b>
 <div style="position: absolute; left: 210px; top: 80px; height: 400px; width: 100px; padding: 10em;">
-<img src="icon.gif" class="dragme" id="test3"><br>
-<img src="icon.gif" class="dragme" id="test4"><br>
+<img src="icon.gif" class="dragme hidden" id="test3"><br>
+<img src="icon.gif" class="dragme hidden" id="test4"><br>
 </div>
 </body>
 </html>
diff --git a/common/src/web/draggableLists.html b/common/src/web/draggableLists.html
index df1fcdc538f65..d8971d163886d 100644
--- a/common/src/web/draggableLists.html
+++ b/common/src/web/draggableLists.html
@@ -14,33 +14,34 @@
     </style>
     <script type="text/javascript">
       $(function() {
-          $("#sortable1, #sortable2").sortable({
-            connectWith: '.connectedSortable'
-            }).disableSelection();
+        $("#sortable1, #sortable2").sortable({
+          connectWith: '.connectedSortable'
+          }).disableSelection();
 
-          var report_event = function(report_text) {
-            var reportElement = $("#dragging_reports");
-            var origText = reportElement.text();
-            reportElement.text(origText + " " + report_text);
-          }
-
-          $("#sortable2").droppable({
-            out: function(event, ui) {
-              report_event("DragOut");
-            }
-            });
+        var report_event = function(report_text) {
+          var reportElement = $("#dragging_reports");
+          var origText = reportElement.text();
+          reportElement.text(origText + " " + report_text);
+        }
 
-          $("#sortable1").droppable({
-            drop: function(event, ui) {
-              report_event("DropIn " + ui.draggable.text());
-            }
-            });
+        $("#sortable2").droppable({
+          out: function(event, ui) {
+            report_event("DragOut");
+          }
           });
+
+        $("#sortable1").droppable({
+          drop: function(event, ui) {
+            report_event("DropIn " + ui.draggable.text());
+          }
+        });
+        $("#sortable1, #sortable2").show();
+      });
     </script>
   </head>
   <body>
     <div class="demo">
-      <ul id="sortable1" class="connectedSortable">
+      <ul id="sortable1" class="connectedSortable" style="display: none;">
         <li id="leftitem-1" class="ui-state-default">LeftItem 1</li>
         <li id="leftitem-2" class="ui-state-default">LeftItem 2</li>
         <li id="leftitem-3" class="ui-state-default">LeftItem 3</li>
@@ -48,7 +49,7 @@
         <li id="leftitem-5" class="ui-state-default">LeftItem 5</li>
       </ul>
 
-      <ul id="sortable2" class="connectedSortable">
+      <ul id="sortable2" class="connectedSortable" style="display: none;">
         <li id="rightitem-1" class="ui-state-highlight">RightItem 1</li>
         <li id="rightitem-2" class="ui-state-highlight">RightItem 2</li>
         <li id="rightitem-3" class="ui-state-highlight">RightItem 3</li>
diff --git a/common/src/web/droppableItems.html b/common/src/web/droppableItems.html
index a06be5fbc8709..df7e2a20d5afd 100644
--- a/common/src/web/droppableItems.html
+++ b/common/src/web/droppableItems.html
@@ -11,42 +11,45 @@
   #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
   </style>
   <script type="text/javascript">
-  $(function() {
-    $("#draggable").draggable();
-    $("#droppable").droppable({
-      drop: function(event, ui) {
-        $(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+    $(function () {
+      $("#draggable").draggable();
+      $("#droppable").droppable({
+        drop: function () {
+          $(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+        }
+      });
+
+      const report_event = function (report_text) {
+        const reportElement = $("#drop_reports");
+        const origText = reportElement.text();
+        reportElement.text(origText + " " + report_text);
       }
-  });
 
-        var report_event = function(report_text) {
-          var reportElement = $("#drop_reports");
-          var origText = reportElement.text();
-          reportElement.text(origText + " " + report_text);
-        }
+      $('body').mousedown(function () {
+        report_event('down');
+      });
 
-        $('body').mousedown(function() {
-            report_event('down');
-        });
+      $('body').mousemove(function () {
+        report_event('move');
+      });
 
-        $('body').mousemove(function() {
-            report_event('move');
-        });
+      $('body').mouseup(function () {
+        report_event('up');
+      });
 
-        $('body').mouseup(function() {
-            report_event('up');
-        });
-  });
+      $("#droppable").show();
+      $("#draggable").show();
+    });
   </script>
 </head>
 <body>
 <div class="demo">
 
-<div id="draggable" class="ui-widget-content">
+<div id="draggable" class="ui-widget-content" style="display: none;">
   <p>Drag me to my target</p>
 </div>
 
-<div id="droppable" class="ui-widget-header">
+<div id="droppable" class="ui-widget-header" style="display: none;">
   <p>Drop here</p>
 </div>
 
diff --git a/common/src/web/macbeth.html b/common/src/web/macbeth.html
index 9fa39d5666aba..bf4eee642dff2 100644
--- a/common/src/web/macbeth.html
+++ b/common/src/web/macbeth.html
@@ -7,6 +7,8 @@
  </HEAD>
  <body bgcolor="#ffffff" text="#000000">
 
+ <h1>The Tragedy of Macbeth</h1>
+
  <!-- Originally from http://shakespeare.mit.edu/macbeth/full.html -->
 
 <a href="#5.8.86">Quick link to last speech</a>
diff --git a/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java b/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java
index 4017888567ba6..e3e7eb24ae6fa 100644
--- a/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java
+++ b/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java
@@ -50,7 +50,7 @@ private ExpectedConditions() {
    * @return true when the title matches, false otherwise
    */
   public static ExpectedCondition<Boolean> titleIs(final String title) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentTitle = "";
 
       @Override
@@ -73,7 +73,7 @@ public String toString() {
    * @return true when the title matches, false otherwise
    */
   public static ExpectedCondition<Boolean> titleContains(final String title) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentTitle = "";
 
       @Override
@@ -96,7 +96,7 @@ public String toString() {
    * @return <code>true</code> when the URL is what it should be
    */
   public static ExpectedCondition<Boolean> urlToBe(final String url) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentUrl = "";
 
       @Override
@@ -119,7 +119,7 @@ public String toString() {
    * @return <code>true</code> when the URL contains the text
    */
   public static ExpectedCondition<Boolean> urlContains(final String fraction) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentUrl = "";
 
       @Override
@@ -142,7 +142,7 @@ public String toString() {
    * @return <code>true</code> if the URL matches the specified regular expression
    */
   public static ExpectedCondition<Boolean> urlMatches(final String regex) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private final Pattern pattern = Pattern.compile(regex);
       private @Nullable String currentUrl;
 
@@ -168,7 +168,7 @@ public String toString() {
    * @return the WebElement once it is located
    */
   public static ExpectedCondition<WebElement> presenceOfElementLocated(final By locator) {
-    return new ExpectedCondition<WebElement>() {
+    return new ExpectedCondition<>() {
       @Override
       public WebElement apply(WebDriver driver) {
         return driver.findElement(locator);
@@ -189,9 +189,8 @@ public String toString() {
    * @param locator used to find the element
    * @return the WebElement once it is located and visible
    */
-  public static ExpectedCondition<@Nullable WebElement> visibilityOfElementLocated(
-      final By locator) {
-    return new ExpectedCondition<@Nullable WebElement>() {
+  public static ExpectedCondition<WebElement> visibilityOfElementLocated(final By locator) {
+    return new ExpectedCondition<>() {
       @Override
       public @Nullable WebElement apply(WebDriver driver) {
         try {
@@ -340,7 +339,7 @@ public String toString() {
   public static ExpectedCondition<Boolean> textToBePresentInElement(
       final WebElement element, final String text) {
 
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -369,7 +368,7 @@ public String toString() {
   public static ExpectedCondition<Boolean> textToBePresentInElementLocated(
       final By locator, final String text) {
 
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -398,7 +397,7 @@ public String toString() {
   public static ExpectedCondition<Boolean> textToBePresentInElementValue(
       final WebElement element, final String text) {
 
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -431,7 +430,7 @@ public String toString() {
   public static ExpectedCondition<Boolean> textToBePresentInElementValue(
       final By locator, final String text) {
 
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -460,9 +459,9 @@ public String toString() {
    * @param frameLocator used to find the frame (id or name)
    * @return WebDriver instance after frame has been switched
    */
-  public static ExpectedCondition<@Nullable WebDriver> frameToBeAvailableAndSwitchToIt(
+  public static ExpectedCondition<WebDriver> frameToBeAvailableAndSwitchToIt(
       final String frameLocator) {
-    return new ExpectedCondition<@Nullable WebDriver>() {
+    return new ExpectedCondition<>() {
       @Override
       public @Nullable WebDriver apply(WebDriver driver) {
         try {
@@ -514,9 +513,9 @@ public String toString() {
    * @param frameLocator used to find the frame (index)
    * @return WebDriver instance after frame has been switched
    */
-  public static ExpectedCondition<@Nullable WebDriver> frameToBeAvailableAndSwitchToIt(
+  public static ExpectedCondition<WebDriver> frameToBeAvailableAndSwitchToIt(
       final int frameLocator) {
-    return new ExpectedCondition<@Nullable WebDriver>() {
+    return new ExpectedCondition<>() {
       @Override
       public @Nullable WebDriver apply(WebDriver driver) {
         try {
@@ -538,7 +537,7 @@ public String toString() {
    *
    * <p>If the frame is available it switches the given driver to the specified web element.
    *
-   * @param frameLocator used to find the frame (webelement)
+   * @param frameLocator used to find the frame (web element)
    * @return WebDriver instance after frame has been switched
    */
   public static ExpectedCondition<@Nullable WebDriver> frameToBeAvailableAndSwitchToIt(
@@ -567,7 +566,7 @@ public String toString() {
    * @return true if the element is not displayed or the element doesn't exist or stale element
    */
   public static ExpectedCondition<Boolean> invisibilityOfElementLocated(final By locator) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -596,7 +595,7 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> invisibilityOfElementWithText(
       final By locator, final String text) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -625,8 +624,8 @@ public String toString() {
    * @param locator used to find the element
    * @return the WebElement once it is located and clickable (visible and enabled)
    */
-  public static ExpectedCondition<@Nullable WebElement> elementToBeClickable(final By locator) {
-    return new ExpectedCondition<@Nullable WebElement>() {
+  public static ExpectedCondition<WebElement> elementToBeClickable(final By locator) {
+    return new ExpectedCondition<>() {
       @Override
       public @Nullable WebElement apply(WebDriver driver) {
         WebElement element = visibilityOfElementLocated(locator).apply(driver);
@@ -653,9 +652,8 @@ public String toString() {
    * @param element the WebElement
    * @return the (same) WebElement once it is clickable (visible and enabled)
    */
-  public static ExpectedCondition<@Nullable WebElement> elementToBeClickable(
-      final WebElement element) {
-    return new ExpectedCondition<@Nullable WebElement>() {
+  public static ExpectedCondition<WebElement> elementToBeClickable(final WebElement element) {
+    return new ExpectedCondition<>() {
 
       @Override
       public @Nullable WebElement apply(WebDriver driver) {
@@ -684,7 +682,7 @@ public String toString() {
    * @return false if the element is still attached to the DOM, true otherwise.
    */
   public static ExpectedCondition<Boolean> stalenessOf(final WebElement element) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver ignored) {
         try {
@@ -752,7 +750,7 @@ public static ExpectedCondition<Boolean> elementToBeSelected(final WebElement el
    */
   public static ExpectedCondition<Boolean> elementSelectionStateToBe(
       final WebElement element, final boolean selected) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         return element.isSelected() == selected;
@@ -771,7 +769,7 @@ public static ExpectedCondition<Boolean> elementToBeSelected(final By locator) {
 
   public static ExpectedCondition<Boolean> elementSelectionStateToBe(
       final By locator, final boolean selected) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -809,7 +807,7 @@ public String toString() {
   }
 
   public static ExpectedCondition<Boolean> numberOfWindowsToBe(final int expectedNumberOfWindows) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -836,7 +834,7 @@ public String toString() {
    * @return true once the condition is satisfied
    */
   public static ExpectedCondition<Boolean> not(final ExpectedCondition<?> condition) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         Object result = condition.apply(driver);
@@ -860,7 +858,7 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> attributeToBe(
       final By locator, final String attribute, final String value) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentValue = null;
 
       @Override
@@ -890,7 +888,7 @@ public String toString() {
    * @return Boolean true when element has text value equal to @value
    */
   public static ExpectedCondition<Boolean> textToBe(final By locator, final String value) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentValue = null;
 
       @Override
@@ -920,7 +918,7 @@ public String toString() {
    * @return Boolean true when element has text value containing @value
    */
   public static ExpectedCondition<Boolean> textMatches(final By locator, final Pattern pattern) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentValue = null;
 
       @Override
@@ -1038,7 +1036,7 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> domPropertyToBe(
       final WebElement element, final String property, final String value) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentValue = null;
 
       @Override
@@ -1065,7 +1063,7 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> domAttributeToBe(
       final WebElement element, final String attribute, final String value) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentValue = null;
 
       @Override
@@ -1092,7 +1090,7 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> attributeToBe(
       final WebElement element, final String attribute, final String value) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       private @Nullable String currentValue = null;
 
       @Override
@@ -1124,7 +1122,7 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> attributeContains(
       final WebElement element, final String attribute, final String value) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         return getAttributeOrCssValue(element, attribute)
@@ -1150,7 +1148,7 @@ public String toString() {
    */
   public static ExpectedCondition<Boolean> attributeContains(
       final By locator, final String attribute, final String value) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         return getAttributeOrCssValue(driver.findElement(locator), attribute)
@@ -1166,7 +1164,7 @@ public String toString() {
   }
 
   /**
-   * An expectation for checking WebElement any non empty value for given attribute
+   * An expectation for checking WebElement any non-empty value for given attribute
    *
    * @param element used to check its parameters
    * @param attribute used to define css or html attribute
@@ -1259,7 +1257,7 @@ public String toString() {
    */
   public static ExpectedCondition<WebElement> presenceOfNestedElementLocatedBy(
       final By locator, final By childLocator) {
-    return new ExpectedCondition<WebElement>() {
+    return new ExpectedCondition<>() {
 
       @Override
       public WebElement apply(WebDriver webDriver) {
@@ -1283,7 +1281,7 @@ public String toString() {
   public static ExpectedCondition<WebElement> presenceOfNestedElementLocatedBy(
       final WebElement element, final By childLocator) {
 
-    return new ExpectedCondition<WebElement>() {
+    return new ExpectedCondition<>() {
 
       @Override
       public WebElement apply(WebDriver webDriver) {
@@ -1340,7 +1338,7 @@ public static ExpectedCondition<Boolean> invisibilityOfAllElements(final WebElem
    */
   public static ExpectedCondition<Boolean> invisibilityOfAllElements(
       final List<WebElement> elements) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
 
       @Override
       public Boolean apply(WebDriver webDriver) {
@@ -1361,7 +1359,7 @@ public String toString() {
    * @return Boolean true when element is not visible anymore
    */
   public static ExpectedCondition<Boolean> invisibilityOf(final WebElement element) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
 
       @Override
       public Boolean apply(WebDriver webDriver) {
@@ -1393,7 +1391,7 @@ private static boolean isInvisible(final WebElement element) {
    * @return true once one of conditions is satisfied
    */
   public static ExpectedCondition<Boolean> or(final ExpectedCondition<?>... conditions) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         RuntimeException lastException = null;
@@ -1437,7 +1435,7 @@ public String toString() {
    * @return true once all conditions are satisfied
    */
   public static ExpectedCondition<Boolean> and(final ExpectedCondition<?>... conditions) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         for (ExpectedCondition<?> condition : conditions) {
@@ -1468,13 +1466,13 @@ public String toString() {
   /**
    * An expectation to check if js executable.
    *
-   * <p>Useful when you know that there should be a Javascript value or something at the stage.
+   * <p>Useful when you know that there should be a JavaScript value or something at the stage.
    *
    * @param javaScript used as executable script
-   * @return true once javaScript executed without errors
+   * @return true once JavaScript executed without errors
    */
   public static ExpectedCondition<Boolean> javaScriptThrowsNoExceptions(final String javaScript) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver driver) {
         try {
@@ -1493,10 +1491,10 @@ public String toString() {
   }
 
   /**
-   * An expectation for String value from javascript
+   * An expectation for String value from JavaScript
    *
    * @param javaScript as executable js line
-   * @return object once javaScript executes without errors
+   * @return object once JavaScript executes without errors
    */
   public static ExpectedCondition<@Nullable Object> jsReturnsValue(final String javaScript) {
     return new ExpectedCondition<@Nullable Object>() {
diff --git a/java/test/org/openqa/selenium/CorrectEventFiringTest.java b/java/test/org/openqa/selenium/CorrectEventFiringTest.java
index 31ace7b571c68..7688845fa6a9a 100644
--- a/java/test/org/openqa/selenium/CorrectEventFiringTest.java
+++ b/java/test/org/openqa/selenium/CorrectEventFiringTest.java
@@ -19,13 +19,9 @@
 
 import static org.assertj.core.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.openqa.selenium.WaitingConditions.elementTextToContain;
-import static org.openqa.selenium.WaitingConditions.elementTextToEqual;
-import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
+import static org.openqa.selenium.WaitingConditions.*;
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
-import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
-import static org.openqa.selenium.testing.drivers.Browser.IE;
-import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
+import static org.openqa.selenium.testing.drivers.Browser.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -392,23 +388,7 @@ public void testSendingKeysToAFocusedElementShouldNotBlurThatElement() {
     element.click();
 
     // Wait until focused
-    boolean focused = false;
-    WebElement result = driver.findElement(By.id("result"));
-    for (int i = 0; i < 5; ++i) {
-      String fired = result.getText();
-      if (fired.contains("focus")) {
-        focused = true;
-        break;
-      }
-      try {
-        Thread.sleep(200);
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    assertThat(focused)
-        .as("If clicking on element didn't focus it in time, we can't proceed with the test")
-        .isTrue();
+    wait.until(elementTextToContain(By.id("result"), "focus"));
 
     element.sendKeys("a");
     assertEventNotFired("blur", driver);
diff --git a/java/test/org/openqa/selenium/ElementAttributeTest.java b/java/test/org/openqa/selenium/ElementAttributeTest.java
index e03ca7d63f728..97f8980f6bee7 100644
--- a/java/test/org/openqa/selenium/ElementAttributeTest.java
+++ b/java/test/org/openqa/selenium/ElementAttributeTest.java
@@ -27,7 +27,6 @@
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
 
 import java.util.List;
-import java.util.logging.Logger;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.environment.webserver.Page;
 import org.openqa.selenium.support.ui.ExpectedConditions;
@@ -36,8 +35,6 @@
 
 class ElementAttributeTest extends JupiterTestBase {
 
-  private static final Logger LOG = Logger.getLogger(ElementAttributeTest.class.getName());
-
   @Test
   void testShouldReturnNullWhenGettingTheValueOfAnAttributeThatIsNotListed() {
     driver.get(pages.simpleTestPage);
@@ -265,12 +262,6 @@ void testCanReturnATextApproximationOfTheStyleAttribute() {
   void testShouldCorrectlyReportValueOfColspan() {
     driver.get(pages.tables);
 
-    try {
-      Thread.sleep(1000);
-    } catch (InterruptedException e) {
-      LOG.severe("Error during execution: " + e.getMessage());
-    }
-
     WebElement th1 = driver.findElement(By.id("th1"));
     WebElement td2 = driver.findElement(By.id("td2"));
 
diff --git a/java/test/org/openqa/selenium/ReferrerTest.java b/java/test/org/openqa/selenium/ReferrerTest.java
index 0fd58d08b02df..e369f187f1d07 100644
--- a/java/test/org/openqa/selenium/ReferrerTest.java
+++ b/java/test/org/openqa/selenium/ReferrerTest.java
@@ -114,9 +114,15 @@ public void startServers() {
 
   @AfterEach
   public void stopServers() {
-    safelyCall(() -> proxyServer.stop());
-    safelyCall(() -> server1.stop());
-    safelyCall(() -> server2.stop());
+    if (proxyServer != null) {
+      safelyCall(() -> proxyServer.stop());
+    }
+    if (server1 != null) {
+      safelyCall(() -> server1.stop());
+    }
+    if (server2 != null) {
+      safelyCall(() -> server2.stop());
+    }
   }
 
   private WebDriver createDriver(String pacUrl) {
diff --git a/java/test/org/openqa/selenium/SessionHandlingTest.java b/java/test/org/openqa/selenium/SessionHandlingTest.java
index ba261c061418f..e285e264dc438 100644
--- a/java/test/org/openqa/selenium/SessionHandlingTest.java
+++ b/java/test/org/openqa/selenium/SessionHandlingTest.java
@@ -17,22 +17,29 @@
 
 package org.openqa.selenium;
 
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.*;
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.openqa.selenium.remote.RemoteWebDriver;
+import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.testing.JupiterTestBase;
 import org.openqa.selenium.testing.NoDriverAfterTest;
 import org.openqa.selenium.testing.NotYetImplemented;
 
 class SessionHandlingTest extends JupiterTestBase {
+  @BeforeEach
+  void setUp() {
+    assertThat(getSessionId()).isNotNull();
+  }
 
   @NoDriverAfterTest
   @Test
   void callingQuitMoreThanOnceOnASessionIsANoOp() {
     driver.quit();
-    sleepTight(3000);
+    waitUntilBrowserFullyClosed();
     driver.quit();
   }
 
@@ -42,7 +49,6 @@ void callingQuitMoreThanOnceOnASessionIsANoOp() {
   @NotYetImplemented(SAFARI)
   public void callingQuitAfterClosingTheLastWindowIsANoOp() {
     driver.close();
-    sleepTight(3000);
     driver.quit();
   }
 
@@ -50,7 +56,6 @@ public void callingQuitAfterClosingTheLastWindowIsANoOp() {
   @Test
   void callingAnyOperationAfterClosingTheLastWindowShouldThrowAnException() {
     driver.close();
-    sleepTight(3000);
     assertThatExceptionOfType(NoSuchSessionException.class).isThrownBy(driver::getCurrentUrl);
   }
 
@@ -58,21 +63,22 @@ void callingAnyOperationAfterClosingTheLastWindowShouldThrowAnException() {
   @Test
   void callingAnyOperationAfterQuitShouldThrowAnException() {
     driver.quit();
-    sleepTight(3000);
+    waitUntilBrowserFullyClosed();
     assertThatExceptionOfType(NoSuchSessionException.class).isThrownBy(driver::getCurrentUrl);
   }
 
   @Test
-  void shouldContinueAfterSleep() {
-    sleepTight(10000);
-    driver.getWindowHandle(); // should not throw
+  void shouldContinueAfterSleep() throws InterruptedException {
+    assertThatCode(() -> driver.getWindowHandle()).doesNotThrowAnyException();
+    Thread.sleep(50);
+    assertThatCode(() -> driver.getWindowHandle()).doesNotThrowAnyException();
+  }
+
+  private void waitUntilBrowserFullyClosed() {
+    wait.until($ -> getSessionId() == null);
   }
 
-  private void sleepTight(long duration) {
-    try {
-      Thread.sleep(duration);
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    }
+  private SessionId getSessionId() {
+    return ((RemoteWebDriver) driver).getSessionId();
   }
 }
diff --git a/java/test/org/openqa/selenium/WaitingConditions.java b/java/test/org/openqa/selenium/WaitingConditions.java
index 8d072d96e38c1..2ec93a2dd22be 100644
--- a/java/test/org/openqa/selenium/WaitingConditions.java
+++ b/java/test/org/openqa/selenium/WaitingConditions.java
@@ -77,8 +77,7 @@ boolean compareText(String expectedValue, String actualValue) {
   }
 
   public static ExpectedCondition<String> elementTextToEqual(final By locator, final String value) {
-    return new ExpectedCondition<String>() {
-
+    return new ExpectedCondition<>() {
       @Override
       public String apply(WebDriver driver) {
         String text = driver.findElement(locator).getText();
@@ -96,19 +95,46 @@ public String toString() {
     };
   }
 
+  public static ExpectedCondition<String> elementTextToContain(
+      final By locator, final String expected) {
+    return new ExpectedCondition<>() {
+      @Override
+      public String apply(WebDriver driver) {
+        String text = driver.findElement(locator).getText();
+        return text.contains(expected) ? text : null;
+      }
+
+      @Override
+      public String toString() {
+        return String.format("element text did not contain \"%s\"", expected);
+      }
+    };
+  }
+
+  public static ExpectedCondition<String> elementTextToMatch(final By locator, final String regex) {
+    return new ExpectedCondition<>() {
+      @Override
+      public String apply(WebDriver driver) {
+        String text = driver.findElement(locator).getText();
+        return text.matches(regex) ? text : null;
+      }
+
+      @Override
+      public String toString() {
+        return String.format("element text did not match \"%s\"", regex);
+      }
+    };
+  }
+
   public static ExpectedCondition<String> elementValueToEqual(
       final WebElement element, final String expectedValue) {
-    return new ExpectedCondition<String>() {
-
+    return new ExpectedCondition<>() {
       private String lastValue = "";
 
       @Override
       public String apply(WebDriver ignored) {
         lastValue = element.getAttribute("value");
-        if (expectedValue.equals(lastValue)) {
-          return lastValue;
-        }
-        return null;
+        return expectedValue.equals(lastValue) ? lastValue : null;
       }
 
       @Override
@@ -119,15 +145,11 @@ public String toString() {
   }
 
   public static ExpectedCondition<String> pageSourceToContain(final String expectedText) {
-    return new ExpectedCondition<String>() {
+    return new ExpectedCondition<>() {
       @Override
       public String apply(WebDriver driver) {
         String source = driver.getPageSource();
-
-        if (source.contains(expectedText)) {
-          return source;
-        }
-        return null;
+        return source.contains(expectedText) ? source : null;
       }
 
       @Override
@@ -139,17 +161,13 @@ public String toString() {
 
   public static ExpectedCondition<Point> elementLocationToBe(
       final WebElement element, final Point expectedLocation) {
-    return new ExpectedCondition<Point>() {
+    return new ExpectedCondition<>() {
       private Point currentLocation = new Point(0, 0);
 
       @Override
       public Point apply(WebDriver ignored) {
         currentLocation = element.getLocation();
-        if (currentLocation.equals(expectedLocation)) {
-          return expectedLocation;
-        }
-
-        return null;
+        return currentLocation.equals(expectedLocation) ? expectedLocation : null;
       }
 
       @Override
@@ -182,7 +200,7 @@ public static ExpectedCondition<String> newWindowIsOpened(final Set<String> orig
   }
 
   public static ExpectedCondition<WebDriver> windowToBeSwitchedToWithName(final String windowName) {
-    return new ExpectedCondition<WebDriver>() {
+    return new ExpectedCondition<>() {
 
       @Override
       public WebDriver apply(WebDriver driver) {
diff --git a/java/test/org/openqa/selenium/WaitingConditionsTest.java b/java/test/org/openqa/selenium/WaitingConditionsTest.java
new file mode 100644
index 0000000000000..141e4db4dcdb3
--- /dev/null
+++ b/java/test/org/openqa/selenium/WaitingConditionsTest.java
@@ -0,0 +1,58 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium;
+
+import static org.openqa.selenium.WaitingConditions.*;
+import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
+
+import java.time.Duration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.support.ui.WebDriverWait;
+import org.openqa.selenium.testing.JupiterTestBase;
+
+class WaitingConditionsTest extends JupiterTestBase {
+
+  private final By header = By.tagName("h1");
+  private WebDriverWait wait;
+
+  @BeforeEach
+  void setUp() {
+    wait = new WebDriverWait(driver, Duration.ofMillis(1));
+    driver.get(pages.macbethPage);
+    shortWait.until(visibilityOfElementLocated(header));
+  }
+
+  @Test
+  void textEquals() {
+    wait.until(elementTextToEqual(header, "The Tragedy of Macbeth"));
+  }
+
+  @Test
+  void textContains() {
+    wait.until(elementTextToContain(driver.findElement(header), "he Tragedy of"));
+    wait.until(elementTextToContain(driver.findElement(header), "The Tragedy"));
+    wait.until(elementTextToContain(driver.findElement(header), "of Macbeth"));
+  }
+
+  @Test
+  void textMatches() {
+    wait.until(elementTextToMatch(header, "The Tragedy of Macbeth"));
+    wait.until(elementTextToMatch(header, ".+ Tragedy of .+"));
+  }
+}
diff --git a/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java b/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java
index 38b1e67e6b9ca..fd7230db98634 100644
--- a/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java
@@ -20,10 +20,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.Offset.offset;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
-import static org.openqa.selenium.WaitingConditions.windowHandleCountToBe;
-import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
-import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
+import static org.openqa.selenium.WaitingConditions.*;
+import static org.openqa.selenium.support.ui.ExpectedConditions.*;
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
 import static org.openqa.selenium.testing.TestUtilities.getIEVersion;
 import static org.openqa.selenium.testing.TestUtilities.isInternetExplorer;
@@ -40,7 +38,6 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.Point;
-import org.openqa.selenium.WaitingConditions;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.bidi.module.Input;
 import org.openqa.selenium.bidi.module.Script;
@@ -416,28 +413,32 @@ public void testHoldingDownShiftKeyWhileClicking() {
   }
 
   @Test
-  public void canClickOnASuckerFishStyleMenu() throws InterruptedException {
+  public void canClickOnASuckerFishStyleMenu() {
     driver.get(pages.javascriptPage);
+    unfocusMenu();
 
-    // Move to a different element to make sure the mouse is not over the
-    // element with id 'item1' (from a previous test).
-    new Actions(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
-
-    WebElement element = driver.findElement(By.id("menu1"));
+    WebElement menu = driver.findElement(By.id("menu1"));
+    WebElement menuItem = driver.findElement(By.id("item1"));
+    assertThat(menuItem.isDisplayed()).isFalse();
+    assertThat(driver.findElement(By.id("result")).getText()).isBlank();
 
-    final WebElement item = driver.findElement(By.id("item1"));
-    assertThat(item.getText()).isEmpty();
-
-    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", element);
-    input.perform(windowHandle, new Actions(driver).moveToElement(element).getSequences());
+    // Hover the menu icon
+    input.perform(windowHandle, new Actions(driver).moveToElement(menu).getSequences());
+    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", menu);
 
-    // Intentionally wait to make sure hover persists.
-    Thread.sleep(2000);
+    // Wait until the menu items appear
+    shortWait.until(visibilityOf(menuItem));
 
-    item.click();
+    menuItem.click();
+    wait.until(elementTextToEqual(By.id("result"), "item 1"));
+  }
 
-    WebElement result = driver.findElement(By.id("result"));
-    wait.until(WaitingConditions.elementTextToContain(result, "item 1"));
+  /**
+   * Move to a different element to make sure the mouse is not over the menu items (from a previous
+   * test).
+   */
+  private void unfocusMenu() {
+    new Actions(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java b/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java
index 9cbd26d0b699f..bc16b69fc8936 100644
--- a/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java
@@ -19,6 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
 import static org.openqa.selenium.testing.drivers.Browser.IE;
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
@@ -34,7 +35,6 @@
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.Color;
 import org.openqa.selenium.support.Colors;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JupiterTestBase;
 import org.openqa.selenium.testing.NotYetImplemented;
@@ -66,7 +66,7 @@ void testBasicKeyboardInput() {
 
     inputModule.perform(windowHandle, sendLowercase.getSequences());
 
-    shortWait.until(ExpectedConditions.attributeToBe(input, "value", "abc def"));
+    shortWait.until(attributeToBe(input, "value", "abc def"));
   }
 
   @Test
@@ -163,7 +163,7 @@ public void testBasicKeyboardInputOnActiveElement() {
 
     inputModule.perform(windowHandle, getBuilder(driver).sendKeys("abc def").getSequences());
 
-    shortWait.until(ExpectedConditions.attributeToBe(keyReporter, "value", "abc def"));
+    shortWait.until(attributeToBe(keyReporter, "value", "abc def"));
   }
 
   @Test
@@ -196,20 +196,14 @@ void canGenerateKeyboardShortcuts() {
   }
 
   @Test
-  public void testSelectionSelectBySymbol() throws InterruptedException {
+  public void testSelectionSelectBySymbol() {
     driver.get(appServer.whereIs("single_text_input.html"));
 
     WebElement input = driver.findElement(By.id("textInput"));
 
-    inputModule.perform(
-        windowHandle, getBuilder(driver).click(input).sendKeys("abc def").getSequences());
-
-    // TODO: The wait until condition does not wait for the attribute.
-    // Hence this is required.
-    // Not an ideal fix but it needs to be triaged further.
-    Thread.sleep(5000);
+    inputModule.perform(windowHandle, getBuilder(driver).sendKeys("abc def").getSequences());
 
-    shortWait.until(ExpectedConditions.attributeToBe(input, "value", "abc def"));
+    shortWait.until(attributeToBe(input, "value", "abc def"));
 
     inputModule.perform(
         windowHandle,
@@ -236,7 +230,7 @@ public void testSelectionSelectByWord() {
 
     inputModule.perform(
         windowHandle, getBuilder(driver).click(input).sendKeys("abc def").getSequences());
-    wait.until(ExpectedConditions.attributeToBe(input, "value", "abc def"));
+    wait.until(attributeToBe(input, "value", "abc def"));
 
     inputModule.perform(
         windowHandle,
@@ -250,7 +244,7 @@ public void testSelectionSelectByWord() {
             .sendKeys(Keys.DELETE)
             .getSequences());
 
-    wait.until(ExpectedConditions.attributeToBe(input, "value", "abc "));
+    wait.until(attributeToBe(input, "value", "abc "));
   }
 
   @Test
@@ -264,7 +258,7 @@ void testSelectionSelectAll() {
     inputModule.perform(
         windowHandle, getBuilder(driver).click(input).sendKeys("abc def").getSequences());
 
-    shortWait.until(ExpectedConditions.attributeToBe(input, "value", "abc def"));
+    shortWait.until(attributeToBe(input, "value", "abc def"));
 
     inputModule.perform(
         windowHandle,
@@ -297,7 +291,7 @@ private void assertThatFormEventsFiredAreExactly(String expected) {
   }
 
   private void assertThatBodyEventsFiredAreExactly(String expected) {
-    assertThat(driver.findElement(By.id("body_result")).getText().trim())
-        .isEqualTo(expected.trim());
+    assertThat(driver.findElement(By.id("body_result")).getText())
+        .isEqualToIgnoringWhitespace(expected);
   }
 }
diff --git a/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java b/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
index 0807a06d7c3f1..5aee6c6497cb0 100644
--- a/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
@@ -22,8 +22,7 @@
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.support.Colors.GREEN;
 import static org.openqa.selenium.support.Colors.RED;
-import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
-import static org.openqa.selenium.support.ui.ExpectedConditions.not;
+import static org.openqa.selenium.support.ui.ExpectedConditions.*;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
@@ -35,13 +34,7 @@
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.Point;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
+import org.openqa.selenium.*;
 import org.openqa.selenium.bidi.module.Input;
 import org.openqa.selenium.bidi.module.Script;
 import org.openqa.selenium.bidi.script.EvaluateResult;
@@ -80,8 +73,8 @@ private void performDragAndDropWithMouse() {
 
     WebElement dragReporter = driver.findElement(By.id("dragging_reports"));
 
-    WebElement toDrag = driver.findElement(By.id("rightitem-3"));
-    WebElement dragInto = driver.findElement(By.id("sortable1"));
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("rightitem-3")));
+    WebElement dragInto = wait.until(visibilityOfElementLocated(By.id("sortable1")));
 
     Actions holdItem = getBuilder(driver).clickAndHold(toDrag);
 
@@ -109,7 +102,7 @@ private void performDragAndDropWithMouse() {
   @Test
   public void testDraggingElementWithMouseMovesItToAnotherList() {
     performDragAndDropWithMouse();
-    WebElement dragInto = driver.findElement(By.id("sortable1"));
+    WebElement dragInto = wait.until(visibilityOfElementLocated(By.id("sortable1")));
     assertThat(dragInto.findElements(By.tagName("li"))).hasSize(6);
   }
 
@@ -123,15 +116,6 @@ public void testDraggingElementWithMouseFiresEvents() {
     assertThat(text).matches("Nothing happened. (?:DragOut *)+DropIn RightItem 3");
   }
 
-  private boolean isElementAvailable(WebDriver driver, By locator) {
-    try {
-      driver.findElement(locator);
-      return true;
-    } catch (NoSuchElementException e) {
-      return false;
-    }
-  }
-
   @Test
   void testDoubleClickThenGet() {
     // Fails in ff3 if WebLoadingListener removes browser listener
@@ -145,37 +129,21 @@ void testDoubleClickThenGet() {
   }
 
   @Test
-  public void testDragAndDrop() throws InterruptedException {
+  public void testDragAndDrop() {
     driver.get(pages.droppableItems);
 
-    long waitEndTime = System.currentTimeMillis() + 15000;
-
-    while (!isElementAvailable(driver, By.id("draggable"))
-        && (System.currentTimeMillis() < waitEndTime)) {
-      Thread.sleep(200);
-    }
-
-    if (!isElementAvailable(driver, By.id("draggable"))) {
-      throw new RuntimeException("Could not find draggable element after 15 seconds.");
-    }
-
-    WebElement toDrag = driver.findElement(By.id("draggable"));
-    WebElement dropInto = driver.findElement(By.id("droppable"));
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("draggable")));
+    WebElement dropInto = wait.until(visibilityOfElementLocated(By.id("droppable")));
 
     Actions holdDrag = getBuilder(driver).clickAndHold(toDrag);
-
     Actions move = getBuilder(driver).moveToElement(dropInto);
-
     Actions drop = getBuilder(driver).release(dropInto);
 
     inputModule.perform(windowHandle, holdDrag.getSequences());
     inputModule.perform(windowHandle, move.getSequences());
     inputModule.perform(windowHandle, drop.getSequences());
 
-    dropInto = driver.findElement(By.id("droppable"));
-    String text = dropInto.findElement(By.tagName("p")).getText();
-
-    assertThat(text).isEqualTo("Dropped!");
+    wait.until(elementTextToEqual(By.cssSelector("#droppable p"), "Dropped!"));
   }
 
   @Test
@@ -288,26 +256,33 @@ public void testShouldAllowUsersToHoverOverElements() {
   }
 
   @Test
-  public void testHoverPersists() throws Exception {
+  public void testHoverPersists() {
     driver.get(pages.javascriptPage);
-    // Move to a different element to make sure the mouse is not over the
-    // element with id 'item1' (from a previous test).
-    getBuilder(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
+    unfocusMenu();
 
-    WebElement element = driver.findElement(By.id("menu1"));
+    WebElement menu = driver.findElement(By.id("menu1"));
+    WebElement menuItem = driver.findElement(By.id("item1"));
+    assertThat(menuItem.isDisplayed()).isFalse();
+    assertThat(driver.findElement(By.id("result")).getText()).isBlank();
 
-    final WebElement item = driver.findElement(By.id("item1"));
-    assertThat(item.getText()).isEmpty();
+    // Hover the menu icon
+    inputModule.perform(windowHandle, getBuilder(driver).moveToElement(menu).getSequences());
+    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", menu);
 
-    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", element);
-    inputModule.perform(windowHandle, getBuilder(driver).moveToElement(element).getSequences());
+    // Wait until the menu items appear
+    shortWait.until(visibilityOf(menuItem));
+    assertThat(menuItem.getText()).isEqualTo("Item 1");
 
-    // Intentionally wait to make sure hover persists.
-    Thread.sleep(2000);
-
-    wait.until(not(elementTextToEqual(item, "")));
+    menuItem.click();
+    wait.until(elementTextToEqual(By.id("result"), "item 1"));
+  }
 
-    assertThat(item.getText()).isEqualTo("Item 1");
+  /**
+   * Move to a different element to make sure the mouse is not over the menu items (from a previous
+   * test).
+   */
+  private void unfocusMenu() {
+    getBuilder(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
   }
 
   @Test
@@ -462,7 +437,7 @@ private boolean fuzzyPositionMatching(int expectedX, int expectedY, String locat
 
   private ExpectedCondition<Boolean> fuzzyMatchingOfCoordinates(
       final WebElement element, final int x, final int y) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver ignored) {
         return fuzzyPositionMatching(x, y, element.getText());
diff --git a/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java b/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java
index 0b3de4c7da413..c3be49f7b3920 100644
--- a/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java
@@ -19,7 +19,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.openqa.selenium.WaitingConditions.elementLocationToBe;
+import static org.openqa.selenium.WaitingConditions.*;
+import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
@@ -33,7 +34,6 @@
 import org.openqa.selenium.bidi.BiDiException;
 import org.openqa.selenium.bidi.module.Input;
 import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JupiterTestBase;
 import org.openqa.selenium.testing.NoDriverAfterTest;
@@ -51,18 +51,10 @@ public void setUp() {
     inputModule = new Input(driver);
   }
 
-  private static void sleep(int ms) {
-    try {
-      Thread.sleep(ms);
-    } catch (InterruptedException e) {
-      throw new RuntimeException("Interrupted: " + e);
-    }
-  }
-
   @Test
   void testDragAndDropRelative() {
     driver.get(pages.dragAndDropPage);
-    WebElement img = driver.findElement(By.id("test1"));
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test1")));
     Point expectedLocation = img.getLocation();
     expectedLocation = drag(img, expectedLocation, 150, 200);
     wait.until(elementLocationToBe(img, expectedLocation));
@@ -77,8 +69,8 @@ void testDragAndDropRelative() {
   @Test
   void testDragAndDropToElement() {
     driver.get(pages.dragAndDropPage);
-    WebElement img1 = driver.findElement(By.id("test1"));
-    WebElement img2 = driver.findElement(By.id("test2"));
+    WebElement img1 = wait.until(visibilityOfElementLocated(By.id("test1")));
+    WebElement img2 = wait.until(visibilityOfElementLocated(By.id("test2")));
     inputModule.perform(windowHandle, new Actions(driver).dragAndDrop(img2, img1).getSequences());
     assertThat(img2.getLocation()).isEqualTo(img1.getLocation());
   }
@@ -95,8 +87,8 @@ void testDragAndDropToElementInIframe() {
     ((JavascriptExecutor) driver)
         .executeScript("arguments[0].src = arguments[1]", iframe, pages.dragAndDropPage);
     driver.switchTo().frame(0);
-    WebElement img1 = wait.until(ExpectedConditions.presenceOfElementLocated(By.id("test1")));
-    WebElement img2 = driver.findElement(By.id("test2"));
+    WebElement img1 = wait.until(visibilityOfElementLocated(By.id("test1")));
+    WebElement img2 = wait.until(visibilityOfElementLocated(By.id("test2")));
     inputModule.perform(
         driver.getWindowHandle(), new Actions(driver).dragAndDrop(img2, img1).getSequences());
     assertThat(img2.getLocation()).isEqualTo(img1.getLocation());
@@ -114,7 +106,7 @@ void testDragAndDropElementWithOffsetInIframeAtBottom() {
     final WebElement iframe = driver.findElement(By.tagName("iframe"));
     driver.switchTo().frame(iframe);
 
-    WebElement img1 = driver.findElement(By.id("test1"));
+    WebElement img1 = wait.until(visibilityOfElementLocated(By.id("test1")));
     Point initial = img1.getLocation();
 
     inputModule.perform(
@@ -126,7 +118,7 @@ void testDragAndDropElementWithOffsetInIframeAtBottom() {
   @Test
   void testElementInDiv() {
     driver.get(pages.dragAndDropPage);
-    WebElement img = driver.findElement(By.id("test3"));
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test3")));
     Point expectedLocation = img.getLocation();
     expectedLocation = drag(img, expectedLocation, 100, 100);
     assertThat(img.getLocation()).isEqualTo(expectedLocation);
@@ -138,15 +130,13 @@ void testElementInDiv() {
   // BiDi in Chrome does not throw an error in case of target out of bounds
   void testDragTooFar() {
     driver.get(pages.dragAndDropPage);
-    Actions actions = new Actions(driver);
-
-    WebElement img = driver.findElement(By.id("test1"));
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test1")));
 
     assertThatThrownBy(
             () ->
                 inputModule.perform(
                     windowHandle,
-                    actions
+                    new Actions(driver)
                         .dragAndDropBy(img, Integer.MAX_VALUE, Integer.MAX_VALUE)
                         .getSequences()))
         .as("These coordinates are outside the page - expected to fail.")
@@ -164,12 +154,13 @@ void testDragTooFar() {
   @Test
   public void testShouldAllowUsersToDragAndDropToElementsOffTheCurrentViewPort() {
     driver.get(pages.dragAndDropPage);
+    wait.until(visibilityOfElementLocated(By.id("test1")));
 
     JavascriptExecutor js = (JavascriptExecutor) driver;
     js.executeScript("window.resizeTo(300, 300);");
 
     driver.get(pages.dragAndDropPage);
-    WebElement img = driver.findElement(By.id("test3"));
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test3")));
     Point expectedLocation = img.getLocation();
     expectedLocation = drag(img, expectedLocation, 100, 100);
     assertThat(img.getLocation()).isEqualTo(expectedLocation);
@@ -183,31 +174,16 @@ private Point drag(WebElement elem, Point expectedLocation, int moveRightBy, int
   @Test
   void testDragAndDropOnJQueryItems() {
     driver.get(pages.droppableItems);
-
-    WebElement toDrag = driver.findElement(By.id("draggable"));
-    WebElement dropInto = driver.findElement(By.id("droppable"));
-
-    // Wait until all event handlers are installed.
-    sleep(500);
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("draggable")));
+    WebElement dropInto = wait.until(visibilityOfElementLocated(By.id("droppable")));
 
     inputModule.perform(
         windowHandle, new Actions(driver).dragAndDrop(toDrag, dropInto).getSequences());
 
-    String text = dropInto.findElement(By.tagName("p")).getText();
-
-    long waitEndTime = System.currentTimeMillis() + 15000;
-
-    while (!text.equals("Dropped!") && (System.currentTimeMillis() < waitEndTime)) {
-      sleep(200);
-      text = dropInto.findElement(By.tagName("p")).getText();
-    }
-
-    assertThat(text).isEqualTo("Dropped!");
+    wait.until(elementTextToEqual(By.cssSelector("#droppable p"), "Dropped!"));
 
-    WebElement reporter = driver.findElement(By.id("drop_reports"));
-    // Assert that only one mouse click took place and the mouse was moved
-    // during it.
-    assertThat(reporter.getText()).matches("start( move)* down( move)+ up( move)*");
+    // Assert that only one mouse click took place and the mouse was moved during it.
+    wait.until(elementTextToMatch(By.id("drop_reports"), "start( move)* down( move)+ up( move)*"));
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/devtools/CdpFacadeTest.java b/java/test/org/openqa/selenium/devtools/CdpFacadeTest.java
index a2d2d3040f23a..63afa95441f23 100644
--- a/java/test/org/openqa/selenium/devtools/CdpFacadeTest.java
+++ b/java/test/org/openqa/selenium/devtools/CdpFacadeTest.java
@@ -56,6 +56,7 @@ public static void startServer() {
   @AfterAll
   public static void stopServer() {
     safelyCall(() -> server.stop());
+    server = null;
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java
index 3104b66e4231a..899535811ac13 100644
--- a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java
+++ b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java
@@ -96,8 +96,6 @@ void ensureBiDiSessionCreation() {
   @Ignore(IE)
   @Ignore(SAFARI)
   void canListenToLogs() throws ExecutionException, InterruptedException, TimeoutException {
-    driver = new Augmenter().augment(driver);
-
     try (LogInspector logInspector = new LogInspector(driver)) {
       CompletableFuture<ConsoleLogEntry> future = new CompletableFuture<>();
       logInspector.onConsoleEntry(future::complete);
@@ -135,11 +133,14 @@ void canNavigateToUrl() {
 
   @AfterEach
   void clean() {
-    driver.quit();
+    if (driver != null) {
+      driver.quit();
+    }
   }
 
   @AfterAll
   static void stopServer() {
     server.stop();
+    server = null;
   }
 }
diff --git a/java/test/org/openqa/selenium/grid/sessionmap/jdbc/JdbcBackedSessionMapTest.java b/java/test/org/openqa/selenium/grid/sessionmap/jdbc/JdbcBackedSessionMapTest.java
index e0768cba9b78b..9294861f44c8c 100644
--- a/java/test/org/openqa/selenium/grid/sessionmap/jdbc/JdbcBackedSessionMapTest.java
+++ b/java/test/org/openqa/selenium/grid/sessionmap/jdbc/JdbcBackedSessionMapTest.java
@@ -59,8 +59,14 @@ public static void createDB() throws SQLException {
 
   @AfterAll
   public static void killDBConnection() throws SQLException {
-    connection.close();
-    bus.close();
+    if (connection != null) {
+      connection.close();
+      connection = null;
+    }
+    if (bus != null) {
+      bus.close();
+      bus = null;
+    }
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java b/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java
index 4eaed1b1321a9..f1d1269a8c305 100644
--- a/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java
+++ b/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java
@@ -19,10 +19,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
-import static org.openqa.selenium.WaitingConditions.windowHandleCountToBe;
-import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
-import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
+import static org.openqa.selenium.WaitingConditions.*;
+import static org.openqa.selenium.support.ui.ExpectedConditions.*;
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
 import static org.openqa.selenium.testing.TestUtilities.getIEVersion;
 import static org.openqa.selenium.testing.TestUtilities.isInternetExplorer;
@@ -40,7 +38,6 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.Point;
-import org.openqa.selenium.WaitingConditions;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JupiterTestBase;
@@ -385,26 +382,31 @@ public void testHoldingDownShiftKeyWhileClicking() {
   @NotYetImplemented(SAFARI)
   public void canClickOnASuckerFishStyleMenu() throws InterruptedException {
     driver.get(pages.javascriptPage);
+    unfocusMenu();
 
-    // Move to a different element to make sure the mouse is not over the
-    // element with id 'item1' (from a previous test).
-    new Actions(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
+    WebElement menu = driver.findElement(By.id("menu1"));
+    WebElement menuItem = driver.findElement(By.id("item1"));
+    assertThat(menuItem.isDisplayed()).isFalse();
+    assertThat(driver.findElement(By.id("result")).getText()).isBlank();
 
-    WebElement element = driver.findElement(By.id("menu1"));
-
-    final WebElement item = driver.findElement(By.id("item1"));
-    assertThat(item.getText()).isEmpty();
-
-    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", element);
-    new Actions(driver).moveToElement(element).build().perform();
+    // Hover the menu icon
+    new Actions(driver).moveToElement(menu).build().perform();
+    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", menu);
 
-    // Intentionally wait to make sure hover persists.
-    Thread.sleep(2000);
+    // Wait until the menu items appear
+    shortWait.until(visibilityOf(menuItem));
+    assertThat(menuItem.getText()).isEqualTo("Item 1");
 
-    item.click();
+    menuItem.click();
+    wait.until(elementTextToEqual(By.id("result"), "item 1"));
+  }
 
-    WebElement result = driver.findElement(By.id("result"));
-    wait.until(WaitingConditions.elementTextToContain(result, "item 1"));
+  /**
+   * Move to a different element to make sure the mouse is not over the menu items (from a previous
+   * test).
+   */
+  private void unfocusMenu() {
+    driver.findElement(By.id("dynamo")).click();
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/interactions/DefaultMouseTest.java b/java/test/org/openqa/selenium/interactions/DefaultMouseTest.java
index 00b00471a6833..6d6bf8c072eaa 100644
--- a/java/test/org/openqa/selenium/interactions/DefaultMouseTest.java
+++ b/java/test/org/openqa/selenium/interactions/DefaultMouseTest.java
@@ -23,8 +23,8 @@
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.support.Colors.GREEN;
 import static org.openqa.selenium.support.Colors.RED;
-import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
-import static org.openqa.selenium.support.ui.ExpectedConditions.not;
+import static org.openqa.selenium.support.ui.ExpectedConditions.*;
+import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
@@ -35,7 +35,6 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -60,8 +59,8 @@ private void performDragAndDropWithMouse() {
 
     WebElement dragReporter = driver.findElement(By.id("dragging_reports"));
 
-    WebElement toDrag = driver.findElement(By.id("rightitem-3"));
-    WebElement dragInto = driver.findElement(By.id("sortable1"));
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("rightitem-3")));
+    WebElement dragInto = wait.until(visibilityOfElementLocated(By.id("sortable1")));
 
     Action holdItem = getBuilder(driver).clickAndHold(toDrag).build();
 
@@ -90,7 +89,7 @@ private void performDragAndDropWithMouse() {
   @NotYetImplemented(SAFARI)
   public void testDraggingElementWithMouseMovesItToAnotherList() {
     performDragAndDropWithMouse();
-    WebElement dragInto = driver.findElement(By.id("sortable1"));
+    WebElement dragInto = wait.until(visibilityOfElementLocated(By.id("sortable1")));
     assertThat(dragInto.findElements(By.tagName("li"))).hasSize(6);
   }
 
@@ -105,15 +104,6 @@ public void testDraggingElementWithMouseFiresEvents() {
     assertThat(text).matches("Nothing happened. (?:DragOut *)+DropIn RightItem 3");
   }
 
-  private boolean isElementAvailable(WebDriver driver, By locator) {
-    try {
-      driver.findElement(locator);
-      return true;
-    } catch (NoSuchElementException e) {
-      return false;
-    }
-  }
-
   @Test
   void testDoubleClickThenGet() {
     // Fails in ff3 if WebLoadingListener removes browser listener
@@ -129,37 +119,21 @@ void testDoubleClickThenGet() {
 
   @Test
   @NotYetImplemented(SAFARI)
-  public void testDragAndDrop() throws InterruptedException {
+  public void testDragAndDrop() {
     driver.get(pages.droppableItems);
 
-    long waitEndTime = System.currentTimeMillis() + 15000;
-
-    while (!isElementAvailable(driver, By.id("draggable"))
-        && (System.currentTimeMillis() < waitEndTime)) {
-      Thread.sleep(200);
-    }
-
-    if (!isElementAvailable(driver, By.id("draggable"))) {
-      throw new RuntimeException("Could not find draggable element after 15 seconds.");
-    }
-
-    WebElement toDrag = driver.findElement(By.id("draggable"));
-    WebElement dropInto = driver.findElement(By.id("droppable"));
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("draggable")));
+    WebElement dropInto = wait.until(visibilityOfElementLocated(By.id("droppable")));
 
     Action holdDrag = getBuilder(driver).clickAndHold(toDrag).build();
-
     Action move = getBuilder(driver).moveToElement(dropInto).build();
-
     Action drop = getBuilder(driver).release(dropInto).build();
 
     holdDrag.perform();
     move.perform();
     drop.perform();
 
-    dropInto = driver.findElement(By.id("droppable"));
-    String text = dropInto.findElement(By.tagName("p")).getText();
-
-    assertThat(text).isEqualTo("Dropped!");
+    shortWait.until(elementTextToEqual(By.cssSelector("#droppable p"), "Dropped!"));
   }
 
   @Test
@@ -260,26 +234,33 @@ public void testShouldAllowUsersToHoverOverElements() {
 
   @Test
   @NotYetImplemented(SAFARI)
-  public void testHoverPersists() throws Exception {
+  public void testHoverPersists() {
     driver.get(pages.javascriptPage);
-    // Move to a different element to make sure the mouse is not over the
-    // element with id 'item1' (from a previous test).
-    getBuilder(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
+    unfocusMenu();
 
-    WebElement element = driver.findElement(By.id("menu1"));
+    WebElement menu = driver.findElement(By.id("menu1"));
+    WebElement menuItem = driver.findElement(By.id("item1"));
+    assertThat(menuItem.isDisplayed()).isFalse();
+    assertThat(driver.findElement(By.id("result")).getText()).isBlank();
 
-    final WebElement item = driver.findElement(By.id("item1"));
-    assertThat(item.getText()).isEmpty();
+    // Hover the menu icon
+    getBuilder(driver).moveToElement(menu).build().perform();
+    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", menu);
 
-    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", element);
-    getBuilder(driver).moveToElement(element).build().perform();
+    // Wait until the menu items appear
+    wait.until(visibilityOf(menuItem));
+    assertThat(menuItem.getText()).isEqualTo("Item 1");
 
-    // Intentionally wait to make sure hover persists.
-    Thread.sleep(2000);
-
-    wait.until(not(elementTextToEqual(item, "")));
+    menuItem.click();
+    wait.until(elementTextToEqual(By.id("result"), "item 1"));
+  }
 
-    assertThat(item.getText()).isEqualTo("Item 1");
+  /**
+   * Move to a different element to make sure the mouse is not over the menu items (from a previous
+   * test).
+   */
+  private void unfocusMenu() {
+    getBuilder(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/interactions/DragAndDropTest.java b/java/test/org/openqa/selenium/interactions/DragAndDropTest.java
index f866ac6a79618..0dcd431fa4598 100644
--- a/java/test/org/openqa/selenium/interactions/DragAndDropTest.java
+++ b/java/test/org/openqa/selenium/interactions/DragAndDropTest.java
@@ -17,9 +17,11 @@
 
 package org.openqa.selenium.interactions;
 
+import static java.lang.Integer.MAX_VALUE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.openqa.selenium.WaitingConditions.elementLocationToBe;
+import static org.openqa.selenium.WaitingConditions.*;
+import static org.openqa.selenium.support.ui.ExpectedConditions.*;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
 import static org.openqa.selenium.testing.drivers.Browser.IE;
@@ -30,7 +32,6 @@
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JupiterTestBase;
 import org.openqa.selenium.testing.NoDriverAfterTest;
@@ -39,18 +40,10 @@
 
 class DragAndDropTest extends JupiterTestBase {
 
-  private static void sleep(int ms) {
-    try {
-      Thread.sleep(ms);
-    } catch (InterruptedException e) {
-      throw new RuntimeException("Interrupted: " + e);
-    }
-  }
-
   @Test
   void testDragAndDropRelative() {
     driver.get(pages.dragAndDropPage);
-    WebElement img = driver.findElement(By.id("test1"));
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test1")));
     Point expectedLocation = img.getLocation();
     expectedLocation = drag(img, expectedLocation, 150, 200);
     wait.until(elementLocationToBe(img, expectedLocation));
@@ -65,8 +58,8 @@ void testDragAndDropRelative() {
   @Test
   void testDragAndDropToElement() {
     driver.get(pages.dragAndDropPage);
-    WebElement img1 = driver.findElement(By.id("test1"));
-    WebElement img2 = driver.findElement(By.id("test2"));
+    WebElement img1 = wait.until(visibilityOfElementLocated(By.id("test1")));
+    WebElement img2 = wait.until(visibilityOfElementLocated(By.id("test2")));
     new Actions(driver).dragAndDrop(img2, img1).perform();
     assertThat(img2.getLocation()).isEqualTo(img1.getLocation());
   }
@@ -79,8 +72,8 @@ void testDragAndDropToElementInIframe() {
     ((JavascriptExecutor) driver)
         .executeScript("arguments[0].src = arguments[1]", iframe, pages.dragAndDropPage);
     driver.switchTo().frame(0);
-    WebElement img1 = wait.until(ExpectedConditions.presenceOfElementLocated(By.id("test1")));
-    WebElement img2 = driver.findElement(By.id("test2"));
+    WebElement img1 = wait.until(visibilityOfElementLocated(By.id("test1")));
+    WebElement img2 = wait.until(visibilityOfElementLocated(By.id("test2")));
     new Actions(driver).dragAndDrop(img2, img1).perform();
     assertThat(img2.getLocation()).isEqualTo(img1.getLocation());
   }
@@ -93,7 +86,7 @@ void testDragAndDropElementWithOffsetInIframeAtBottom() {
     final WebElement iframe = driver.findElement(By.tagName("iframe"));
     driver.switchTo().frame(iframe);
 
-    WebElement img1 = driver.findElement(By.id("test1"));
+    WebElement img1 = wait.until(visibilityOfElementLocated(By.id("test1")));
     Point initial = img1.getLocation();
 
     new Actions(driver).dragAndDropBy(img1, 20, 20).perform();
@@ -120,7 +113,7 @@ public void testDragAndDropElementWithOffsetInScrolledDiv() {
   @Test
   void testElementInDiv() {
     driver.get(pages.dragAndDropPage);
-    WebElement img = driver.findElement(By.id("test3"));
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test3")));
     Point expectedLocation = img.getLocation();
     expectedLocation = drag(img, expectedLocation, 100, 100);
     assertThat(img.getLocation()).isEqualTo(expectedLocation);
@@ -129,14 +122,12 @@ void testElementInDiv() {
   @Test
   void testDragTooFar() {
     driver.get(pages.dragAndDropPage);
-    Actions actions = new Actions(driver);
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test1")));
 
     assertThatThrownBy(
             () -> {
-              WebElement img = driver.findElement(By.id("test1"));
-
               // Attempt to drag the image outside the bounds of the page.
-              actions.dragAndDropBy(img, Integer.MAX_VALUE, Integer.MAX_VALUE).perform();
+              new Actions(driver).dragAndDropBy(img, MAX_VALUE, MAX_VALUE).perform();
             })
         .as("These coordinates are outside the page - expected to fail.")
         .isInstanceOf(MoveTargetOutOfBoundsException.class);
@@ -145,20 +136,20 @@ void testDragTooFar() {
     new Actions(driver).release().perform();
   }
 
-  @NoDriverAfterTest
-  // We can't reliably resize the window back afterwards, cross-browser, so have to kill the
-  // window, otherwise we are stuck with a small window for the rest of the tests.
+  @NoDriverAfterTest(
+      reason = "We can't reliably resize the window back, so have to kill the browser.")
   // TODO(dawagner): Remove @NoDriverAfterTest when we can reliably do window resizing
   @Test
   @NotYetImplemented(SAFARI)
   public void testShouldAllowUsersToDragAndDropToElementsOffTheCurrentViewPort() {
     driver.get(pages.dragAndDropPage);
+    wait.until(visibilityOfElementLocated(By.id("test1")));
 
     JavascriptExecutor js = (JavascriptExecutor) driver;
     js.executeScript("window.resizeTo(300, 300);");
 
     driver.get(pages.dragAndDropPage);
-    WebElement img = driver.findElement(By.id("test3"));
+    WebElement img = wait.until(visibilityOfElementLocated(By.id("test3")));
     Point expectedLocation = img.getLocation();
     expectedLocation = drag(img, expectedLocation, 100, 100);
     assertThat(img.getLocation()).isEqualTo(expectedLocation);
@@ -173,29 +164,15 @@ private Point drag(WebElement elem, Point expectedLocation, int moveRightBy, int
   void testDragAndDropOnJQueryItems() {
     driver.get(pages.droppableItems);
 
-    WebElement toDrag = driver.findElement(By.id("draggable"));
-    WebElement dropInto = driver.findElement(By.id("droppable"));
-
-    // Wait until all event handlers are installed.
-    sleep(500);
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("draggable")));
+    WebElement dropInto = wait.until(visibilityOfElementLocated(By.id("droppable")));
 
     new Actions(driver).dragAndDrop(toDrag, dropInto).perform();
 
-    String text = dropInto.findElement(By.tagName("p")).getText();
-
-    long waitEndTime = System.currentTimeMillis() + 15000;
-
-    while (!text.equals("Dropped!") && (System.currentTimeMillis() < waitEndTime)) {
-      sleep(200);
-      text = dropInto.findElement(By.tagName("p")).getText();
-    }
-
-    assertThat(text).isEqualTo("Dropped!");
+    wait.until(elementTextToEqual(By.cssSelector("#droppable p"), "Dropped!"));
 
-    WebElement reporter = driver.findElement(By.id("drop_reports"));
-    // Assert that only one mouse click took place and the mouse was moved
-    // during it.
-    assertThat(reporter.getText()).matches("start( move)* down( move)+ up( move)*");
+    // Assert that only one mouse click took place and the mouse was moved during it.
+    wait.until(elementTextToMatch(By.id("drop_reports"), "start( move)* down( move)+ up( move)*"));
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/interactions/PenPointerTest.java b/java/test/org/openqa/selenium/interactions/PenPointerTest.java
index 1dcb6affdcaf1..413f078f4e4f7 100644
--- a/java/test/org/openqa/selenium/interactions/PenPointerTest.java
+++ b/java/test/org/openqa/selenium/interactions/PenPointerTest.java
@@ -23,8 +23,8 @@
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.support.Colors.GREEN;
 import static org.openqa.selenium.support.Colors.RED;
-import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
-import static org.openqa.selenium.support.ui.ExpectedConditions.not;
+import static org.openqa.selenium.support.ui.ExpectedConditions.*;
+import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
@@ -68,11 +68,10 @@ private Actions setDefaultPen(WebDriver driver) {
   private void performDragAndDropWithPen() {
     driver.get(pages.draggableLists);
 
-    WebElement dragReporter = driver.findElement(By.id("dragging_reports"));
-
-    WebElement toDrag = driver.findElement(By.id("rightitem-3"));
-    WebElement dragInto = driver.findElement(By.id("sortable1"));
-    WebElement leftItem = driver.findElement(By.id("leftitem-4"));
+    WebElement dragReporter = wait.until(visibilityOfElementLocated(By.id("dragging_reports")));
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("rightitem-3")));
+    WebElement dragInto = wait.until(visibilityOfElementLocated(By.id("sortable1")));
+    WebElement leftItem = wait.until(visibilityOfElementLocated(By.id("leftitem-4")));
 
     Action moveToSpecificItem = setDefaultPen(driver).moveToElement(leftItem).build();
 
@@ -127,19 +126,8 @@ private boolean isElementAvailable(WebDriver driver, By locator) {
   public void testDragAndDrop() throws InterruptedException {
     driver.get(pages.droppableItems);
 
-    long waitEndTime = System.currentTimeMillis() + 15000;
-
-    while (!isElementAvailable(driver, By.id("draggable"))
-        && (System.currentTimeMillis() < waitEndTime)) {
-      Thread.sleep(200);
-    }
-
-    if (!isElementAvailable(driver, By.id("draggable"))) {
-      throw new RuntimeException("Could not find draggable element after 15 seconds.");
-    }
-
-    WebElement toDrag = driver.findElement(By.id("draggable"));
-    WebElement dropInto = driver.findElement(By.id("droppable"));
+    WebElement toDrag = wait.until(visibilityOfElementLocated(By.id("draggable")));
+    WebElement dropInto = wait.until(visibilityOfElementLocated(By.id("droppable")));
 
     Action holdDrag = setDefaultPen(driver).clickAndHold(toDrag).build();
     Action move = setDefaultPen(driver).moveToElement(dropInto).build();
@@ -149,9 +137,7 @@ public void testDragAndDrop() throws InterruptedException {
     move.perform();
     drop.perform();
 
-    String text = dropInto.findElement(By.tagName("p")).getText();
-
-    assertThat(text).isEqualTo("Dropped!");
+    wait.until(elementTextToEqual(By.cssSelector("#droppable p"), "Dropped!"));
   }
 
   @Test
@@ -215,28 +201,33 @@ public void testShouldAllowUsersToHoverOverElements() {
 
   @Test
   @NotYetImplemented(SAFARI)
-  public void testHoverPersists() throws Exception {
+  public void testHoverPersists() {
     driver.get(pages.javascriptPage);
-    // Move to a different element to make sure the pen is not over the
-    // element with id 'item1' (from a previous test).
-
-    setDefaultPen(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
+    unfocusMenu();
 
-    WebElement element = driver.findElement(By.id("menu1"));
-
-    final WebElement item = driver.findElement(By.id("item1"));
-    assertThat(item.getText()).isEmpty();
+    WebElement menu = driver.findElement(By.id("menu1"));
+    WebElement menuItem = driver.findElement(By.id("item1"));
+    assertThat(menuItem.isDisplayed()).isFalse();
+    assertThat(driver.findElement(By.id("result")).getText()).isBlank();
 
-    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", element);
+    // Hover the menu icon
+    setDefaultPen(driver).moveToElement(menu).build().perform();
+    ((JavascriptExecutor) driver).executeScript("arguments[0].style.background = 'green'", menu);
 
-    setDefaultPen(driver).moveToElement(element).build().perform();
+    // Wait until the menu items appear
+    wait.until(visibilityOf(menuItem));
+    assertThat(menuItem.getText()).isEqualTo("Item 1");
 
-    // Intentionally wait to make sure hover persists.
-    Thread.sleep(2000);
-
-    wait.until(not(elementTextToEqual(item, "")));
+    menuItem.click();
+    wait.until(elementTextToEqual(By.id("result"), "item 1"));
+  }
 
-    assertThat(item.getText()).isEqualTo("Item 1");
+  /**
+   * Move to a different element to make sure the mouse is not over the menu items (from a previous
+   * test).
+   */
+  private void unfocusMenu() {
+    setDefaultPen(driver).moveToElement(driver.findElement(By.id("dynamo"))).build().perform();
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/safari/CrossDomainTest.java b/java/test/org/openqa/selenium/safari/CrossDomainTest.java
index 842f0fc7db4c4..8333e1ae34968 100644
--- a/java/test/org/openqa/selenium/safari/CrossDomainTest.java
+++ b/java/test/org/openqa/selenium/safari/CrossDomainTest.java
@@ -49,7 +49,11 @@ public static void startSecondServer() {
 
   @AfterAll
   public static void stopSecondServer() {
-    otherServer.stop();
+    if (otherServer != null) {
+      otherServer.stop();
+      otherServer = null;
+    }
+    otherPages = null;
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/testing/JupiterTestBase.java b/java/test/org/openqa/selenium/testing/JupiterTestBase.java
index a540bafb7c849..43174905625e0 100644
--- a/java/test/org/openqa/selenium/testing/JupiterTestBase.java
+++ b/java/test/org/openqa/selenium/testing/JupiterTestBase.java
@@ -84,6 +84,12 @@ public void prepareEnvironment() {
     driver = seleniumExtension.getDriver();
     wait = seleniumExtension::waitUntil;
     shortWait = seleniumExtension::shortWaitUntil;
+
+    if (driver != null) {
+      driver.get("about:blank");
+      driver.get(pages.blankPage);
+      driver.manage().deleteAllCookies();
+    }
   }
 
   @AfterEach
diff --git a/java/test/org/openqa/selenium/testing/SeleniumExtension.java b/java/test/org/openqa/selenium/testing/SeleniumExtension.java
index aa2b65429739c..0447443552a09 100644
--- a/java/test/org/openqa/selenium/testing/SeleniumExtension.java
+++ b/java/test/org/openqa/selenium/testing/SeleniumExtension.java
@@ -307,8 +307,8 @@ private static class Instances {
 
     public Instances(WebDriver driver, Duration regularWait, Duration shortWait) {
       this.driver = driver;
-      this.regularWait = new WebDriverWait(driver, regularWait);
-      this.shortWait = new WebDriverWait(driver, shortWait);
+      this.regularWait = new WebDriverWait(driver, regularWait, Duration.ofMillis(20));
+      this.shortWait = new WebDriverWait(driver, shortWait, Duration.ofMillis(20));
     }
   }
 
diff --git a/javascript/atoms/test/testdata/blank_page.html b/javascript/atoms/test/testdata/blank_page.html
index ca07461eacd0a..e649a52f2f997 100644
--- a/javascript/atoms/test/testdata/blank_page.html
+++ b/javascript/atoms/test/testdata/blank_page.html
@@ -4,7 +4,10 @@
   <title>This page deliberately left blank</title>
 </head>
 <body>
-
+  <script>
+    localStorage.clear();
+    sessionStorage.clear();
+  </script>
 </body>
 </html>
 
