diff --git a/java/test/org/openqa/selenium/bidi/browser/BUILD.bazel b/java/test/org/openqa/selenium/bidi/browser/BUILD.bazel
index 1ae44709bdcbf..cf075ea5d8db5 100644
--- a/java/test/org/openqa/selenium/bidi/browser/BUILD.bazel
+++ b/java/test/org/openqa/selenium/bidi/browser/BUILD.bazel
@@ -7,6 +7,7 @@ java_selenium_test_suite(
     srcs = glob(["*Test.java"]),
     browsers = [
         "chrome",
+        "edge",
         "firefox",
     ],
     tags = [
diff --git a/java/test/org/openqa/selenium/bidi/browser/BrowserCommandsTest.java b/java/test/org/openqa/selenium/bidi/browser/BrowserCommandsTest.java
index 6966e08c0fb65..cb1b67a14f69a 100644
--- a/java/test/org/openqa/selenium/bidi/browser/BrowserCommandsTest.java
+++ b/java/test/org/openqa/selenium/bidi/browser/BrowserCommandsTest.java
@@ -19,7 +19,6 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.openqa.selenium.testing.Safely.safelyCall;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.IE;
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
 
@@ -48,7 +47,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCreateAUserContext() {
     String userContext = browser.createUserContext();
 
@@ -60,7 +58,6 @@ void canCreateAUserContext() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canGetUserContexts() {
     String userContext1 = browser.createUserContext();
     String userContext2 = browser.createUserContext();
@@ -75,7 +72,6 @@ void canGetUserContexts() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canRemoveUserContext() {
     String userContext1 = browser.createUserContext();
     String userContext2 = browser.createUserContext();
diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BUILD.bazel b/java/test/org/openqa/selenium/bidi/browsingcontext/BUILD.bazel
index f7b25cedc6d25..71b67efb132f2 100644
--- a/java/test/org/openqa/selenium/bidi/browsingcontext/BUILD.bazel
+++ b/java/test/org/openqa/selenium/bidi/browsingcontext/BUILD.bazel
@@ -7,6 +7,7 @@ java_selenium_test_suite(
     srcs = glob(["*Test.java"]),
     browsers = [
         "chrome",
+        "edge",
         "firefox",
     ],
     tags = [
diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java
index 27adf542361f2..342079512ff18 100644
--- a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java
+++ b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java
@@ -19,10 +19,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.openqa.selenium.testing.Safely.safelyCall;
-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.IE;
-import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
+import static org.openqa.selenium.testing.drivers.Browser.*;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -52,7 +49,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToWindowBrowsingContextCreatedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
@@ -75,7 +71,6 @@ void canListenToWindowBrowsingContextCreatedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToBrowsingContextDestroyedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
@@ -99,7 +94,6 @@ void canListenToBrowsingContextDestroyedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToTabBrowsingContextCreatedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
@@ -121,7 +115,6 @@ void canListenToTabBrowsingContextCreatedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToDomContentLoadedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
@@ -140,7 +133,6 @@ void canListenToDomContentLoadedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToBrowsingContextLoadedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
@@ -179,7 +171,6 @@ void canListenToNavigationStartedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToFragmentNavigatedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
@@ -202,7 +193,6 @@ void canListenToFragmentNavigatedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToUserPromptOpenedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
@@ -224,7 +214,8 @@ void canListenToUserPromptOpenedEvent()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
+  // TODO: This test is flaky for comparing the browsing context id for Chrome and Edge. Fix flaky
+  // test.
   void canListenToUserPromptClosedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (BrowsingContextInspector inspector = new BrowsingContextInspector(driver)) {
diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java
index c83703b3c4812..2630a0a066c87 100644
--- a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java
+++ b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java
@@ -23,7 +23,6 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
 import static org.openqa.selenium.testing.Safely.safelyCall;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 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;
@@ -76,7 +75,6 @@ void canCreateAWindow() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCreateAWindowWithAReferenceContext() {
     BrowsingContext browsingContext =
         new BrowsingContext(driver, WindowType.WINDOW, driver.getWindowHandle());
@@ -94,7 +92,6 @@ void canCreateATab() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCreateATabWithAReferenceContext() {
     BrowsingContext browsingContext =
         new BrowsingContext(driver, WindowType.TAB, driver.getWindowHandle());
@@ -130,7 +127,6 @@ void canNavigateToAUrlWithReadinessState() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canGetTreeWithAChild() {
     String referenceContextId = driver.getWindowHandle();
     BrowsingContext parentWindow = new BrowsingContext(driver, referenceContextId);
@@ -151,7 +147,6 @@ void canGetTreeWithAChild() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canGetTreeWithDepth() {
     String referenceContextId = driver.getWindowHandle();
     BrowsingContext parentWindow = new BrowsingContext(driver, referenceContextId);
diff --git a/java/test/org/openqa/selenium/bidi/input/BUILD.bazel b/java/test/org/openqa/selenium/bidi/input/BUILD.bazel
index d37b61ef4a871..9ae9147c3b872 100644
--- a/java/test/org/openqa/selenium/bidi/input/BUILD.bazel
+++ b/java/test/org/openqa/selenium/bidi/input/BUILD.bazel
@@ -7,6 +7,7 @@ java_selenium_test_suite(
     srcs = glob(["*Test.java"]),
     browsers = [
         "chrome",
+        "edge",
         "firefox",
     ],
     data = [
diff --git a/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java b/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java
index 613fee907c192..afbd3201a2c2a 100644
--- a/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/CombinedInputActionsTest.java
@@ -26,11 +26,7 @@
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
 import static org.openqa.selenium.testing.TestUtilities.getIEVersion;
 import static org.openqa.selenium.testing.TestUtilities.isInternetExplorer;
-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;
-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.util.ArrayList;
 import java.util.List;
@@ -72,7 +68,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testPlainClickingOnMultiSelectionList() {
     driver.get(pages.formSelectionPage);
 
@@ -96,7 +91,6 @@ public void testPlainClickingOnMultiSelectionList() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testShiftClickingOnMultiSelectionList() {
     driver.get(pages.formSelectionPage);
 
@@ -120,7 +114,6 @@ public void testShiftClickingOnMultiSelectionList() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(FIREFOX)
   public void testMultipleInputs() {
     driver.get(pages.formSelectionPage);
@@ -152,7 +145,6 @@ public void testMultipleInputs() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testControlClickingOnMultiSelectionList() {
     assumeFalse(
         getEffectivePlatform(driver).is(Platform.MAC), "FIXME: macs don't have CONTROL key");
@@ -182,7 +174,6 @@ public void testControlClickingOnMultiSelectionList() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testControlClickingOnCustomMultiSelectionList() {
     driver.get(pages.selectableItemsPage);
     Keys key = getEffectivePlatform(driver).is(Platform.MAC) ? Keys.COMMAND : Keys.CONTROL;
@@ -215,7 +206,6 @@ public void testControlClickingOnCustomMultiSelectionList() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(FIREFOX)
   public void testControlClickingWithMultiplePointers() {
     driver.get(pages.selectableItemsPage);
@@ -302,7 +292,6 @@ void canMoveMouseToAnElementInAnIframeAndClick() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testCanClickOnLinks() {
     navigateToClicksPageAndClickLink();
   }
@@ -310,7 +299,6 @@ void testCanClickOnLinks() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testCanClickOnLinksWithAnOffset() {
     driver.get(pages.clicksPage);
 
@@ -326,7 +314,6 @@ public void testCanClickOnLinksWithAnOffset() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testClickAfterMoveToAnElementWithAnOffsetShouldUseLastMousePosition() {
     driver.get(pages.clickEventPage);
 
@@ -370,7 +357,6 @@ private boolean fuzzyPositionMatching(int expectedX, int expectedY, int actualX,
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testMouseMovementWorksWhenNavigatingToAnotherPage() {
     navigateToClicksPageAndClickLink();
 
@@ -384,7 +370,6 @@ public void testMouseMovementWorksWhenNavigatingToAnotherPage() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(CHROME)
   @NotYetImplemented(FIREFOX)
   public void testChordControlCutAndPaste() {
@@ -425,7 +410,6 @@ public void testChordControlCutAndPaste() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testCombiningShiftAndClickResultsInANewWindow() {
     driver.get(pages.linkedImage);
     WebElement link = driver.findElement(By.id("link"));
@@ -451,7 +435,6 @@ public void testCombiningShiftAndClickResultsInANewWindow() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testHoldingDownShiftKeyWhileClicking() {
     driver.get(pages.clickEventPage);
 
@@ -496,7 +479,6 @@ public void canClickOnASuckerFishStyleMenu() throws InterruptedException {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testCanClickOnSuckerFishMenuItem() {
     driver.get(pages.javascriptPage);
 
diff --git a/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java b/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java
index 8f6e79c039151..876951ea14846 100644
--- a/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java
@@ -20,7 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.IE;
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
 
@@ -60,7 +59,6 @@ private Actions getBuilder(WebDriver driver) {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testBasicKeyboardInput() {
     driver.get(appServer.whereIs("single_text_input.html"));
 
@@ -76,7 +74,6 @@ void testBasicKeyboardInput() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(SAFARI)
   public void testSendingKeyDownOnly() {
     driver.get(appServer.whereIs("key_logger.html"));
@@ -99,7 +96,6 @@ public void testSendingKeyDownOnly() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(SAFARI)
   public void testSendingKeyUp() {
     driver.get(appServer.whereIs("key_logger.html"));
@@ -128,7 +124,6 @@ public void testSendingKeyUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(SAFARI)
   public void testSendingKeysWithShiftPressed() {
     driver.get(pages.javascriptPage);
@@ -157,7 +152,6 @@ public void testSendingKeysWithShiftPressed() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(value = SAFARI, reason = "getText does not normalize spaces")
   public void testSendingKeysToActiveElement() {
     driver.get(pages.bodyTypingPage);
@@ -171,7 +165,6 @@ public void testSendingKeysToActiveElement() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(SAFARI)
   public void testBasicKeyboardInputOnActiveElement() {
     driver.get(pages.javascriptPage);
@@ -188,7 +181,6 @@ public void testBasicKeyboardInputOnActiveElement() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canGenerateKeyboardShortcuts() {
     driver.get(appServer.whereIs("keyboard_shortcut.html"));
 
@@ -220,7 +212,6 @@ void canGenerateKeyboardShortcuts() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testSelectionSelectBySymbol() {
     driver.get(appServer.whereIs("single_text_input.html"));
 
@@ -248,7 +239,6 @@ public void testSelectionSelectBySymbol() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @Ignore(IE)
   public void testSelectionSelectByWord() {
     assumeFalse(getEffectivePlatform(driver).is(Platform.MAC), "MacOS has alternative keyboard");
@@ -279,7 +269,6 @@ public void testSelectionSelectByWord() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testSelectionSelectAll() {
     assumeFalse(getEffectivePlatform(driver).is(Platform.MAC), "MacOS has alternative keyboard");
 
diff --git a/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java b/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
index 929b404350013..6f702efa99680 100644
--- a/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
@@ -111,7 +111,6 @@ private void performDragAndDropWithMouse() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testDraggingElementWithMouseMovesItToAnotherList() {
     performDragAndDropWithMouse();
     WebElement dragInto = driver.findElement(By.id("sortable1"));
@@ -123,7 +122,6 @@ public void testDraggingElementWithMouseMovesItToAnotherList() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testDraggingElementWithMouseFiresEvents() {
     performDragAndDropWithMouse();
     WebElement dragReporter = driver.findElement(By.id("dragging_reports"));
@@ -143,7 +141,6 @@ private boolean isElementAvailable(WebDriver driver, By locator) {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testDoubleClickThenGet() {
     // Fails in ff3 if WebLoadingListener removes browser listener
     driver.get(pages.javascriptPage);
@@ -158,7 +155,6 @@ void testDoubleClickThenGet() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testDragAndDrop() throws InterruptedException {
     driver.get(pages.droppableItems);
 
@@ -195,7 +191,6 @@ public void testDragAndDrop() throws InterruptedException {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testDoubleClick() {
     driver.get(pages.javascriptPage);
 
@@ -209,7 +204,6 @@ public void testDoubleClick() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testContextClick() {
     driver.get(pages.javascriptPage);
 
@@ -227,7 +221,6 @@ void testContextClick() {
   @Ignore(value = CHROME, gitHubActions = true)
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testMoveToLocation() {
     driver.get(pages.mouseInteractionPage);
 
@@ -245,7 +238,6 @@ void testMoveToLocation() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testMoveAndClick() {
     driver.get(pages.javascriptPage);
 
@@ -263,8 +255,8 @@ void testMoveAndClick() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(CHROME)
+  @NotYetImplemented(EDGE)
   void testShouldClickElementInIFrame() {
     driver.get(pages.clicksPage);
     driver.switchTo().frame("source");
@@ -303,7 +295,6 @@ void testShouldClickElementInIFrame() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testShouldAllowUsersToHoverOverElements() {
     driver.get(pages.javascriptPage);
 
@@ -322,7 +313,6 @@ public void testShouldAllowUsersToHoverOverElements() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testHoverPersists() throws Exception {
     driver.get(pages.javascriptPage);
     // Move to a different element to make sure the mouse is not over the
@@ -348,7 +338,6 @@ public void testHoverPersists() throws Exception {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testMovingMouseByRelativeOffset() {
     driver.get(pages.mouseTrackerPage);
 
@@ -367,7 +356,6 @@ public void testMovingMouseByRelativeOffset() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testMovingMouseToRelativeElementOffset() {
     driver.get(pages.mouseTrackerPage);
 
@@ -387,7 +375,6 @@ public void testMovingMouseToRelativeElementOffset() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testMovingMouseToRelativeZeroElementOffset() {
     driver.get(pages.mouseTrackerPage);
 
@@ -405,7 +392,6 @@ public void testMovingMouseToRelativeZeroElementOffset() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testMoveRelativeToBody() {
     try {
       driver.get(pages.mouseTrackerPage);
@@ -426,7 +412,6 @@ public void testMoveRelativeToBody() {
   @Ignore(value = FIREFOX, issue = "https://github.com/mozilla/geckodriver/issues/789")
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testMoveMouseByOffsetOverAndOutOfAnElement() {
     driver.get(pages.mouseOverPage);
 
@@ -471,7 +456,6 @@ public void testMoveMouseByOffsetOverAndOutOfAnElement() {
   @Ignore(value = FIREFOX, issue = "https://github.com/mozilla/geckodriver/issues/789")
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testCanMoveOverAndOutOfAnElement() {
     driver.get(pages.mouseOverPage);
 
diff --git a/java/test/org/openqa/selenium/bidi/input/DefaultWheelTest.java b/java/test/org/openqa/selenium/bidi/input/DefaultWheelTest.java
index caca19874bdb5..0be9463ceeaa6 100644
--- a/java/test/org/openqa/selenium/bidi/input/DefaultWheelTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/DefaultWheelTest.java
@@ -144,7 +144,6 @@ void throwErrorWhenElementOriginIsOutOfViewport() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void shouldScrollFromViewportByGivenAmount() {
     driver.get(
         appServer.whereIs("scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html"));
@@ -166,7 +165,6 @@ void shouldScrollFromViewportByGivenAmount() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void shouldScrollFromViewportByGivenAmountFromOrigin() {
     driver.get(appServer.whereIs("scrolling_tests/frame_with_nested_scrolling_frame.html"));
     WheelInput.ScrollOrigin scrollOrigin = WheelInput.ScrollOrigin.fromViewport(10, 10);
@@ -189,7 +187,6 @@ void shouldScrollFromViewportByGivenAmountFromOrigin() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void throwErrorWhenOriginOffsetIsOutOfViewport() {
     assertThrows(
         BiDiException.class,
diff --git a/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java b/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java
index 49ea5e185c759..f6568f29c98eb 100644
--- a/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java
@@ -64,7 +64,6 @@ private static void sleep(int ms) {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testDragAndDropRelative() {
     driver.get(pages.dragAndDropPage);
     WebElement img = driver.findElement(By.id("test1"));
@@ -82,7 +81,6 @@ void testDragAndDropRelative() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testDragAndDropToElement() {
     driver.get(pages.dragAndDropPage);
     WebElement img1 = driver.findElement(By.id("test1"));
@@ -138,7 +136,6 @@ void testDragAndDropElementWithOffsetInIframeAtBottom() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testElementInDiv() {
     driver.get(pages.dragAndDropPage);
     WebElement img = driver.findElement(By.id("test3"));
@@ -179,7 +176,6 @@ void testDragTooFar() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testShouldAllowUsersToDragAndDropToElementsOffTheCurrentViewPort() {
     driver.get(pages.dragAndDropPage);
 
@@ -201,7 +197,6 @@ private Point drag(WebElement elem, Point expectedLocation, int moveRightBy, int
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void testDragAndDropOnJQueryItems() {
     driver.get(pages.droppableItems);
 
diff --git a/java/test/org/openqa/selenium/bidi/input/ReleaseCommandTest.java b/java/test/org/openqa/selenium/bidi/input/ReleaseCommandTest.java
index 0b4f76efa44b2..2951b2df3e582 100644
--- a/java/test/org/openqa/selenium/bidi/input/ReleaseCommandTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/ReleaseCommandTest.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.bidi.input;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.IE;
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
 
@@ -54,7 +53,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testReleaseInBrowsingContext() {
     driver.get(server.whereIs("/bidi/release_action.html"));
 
diff --git a/java/test/org/openqa/selenium/bidi/input/SetFilesCommandTest.java b/java/test/org/openqa/selenium/bidi/input/SetFilesCommandTest.java
index ccdb2dfde05e1..5a5be321f61ec 100644
--- a/java/test/org/openqa/selenium/bidi/input/SetFilesCommandTest.java
+++ b/java/test/org/openqa/selenium/bidi/input/SetFilesCommandTest.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.bidi.input;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 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;
@@ -57,7 +56,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(FIREFOX)
   void canSetFiles() throws IOException {
     driver.get(pages.formPage);
@@ -82,7 +80,6 @@ void canSetFiles() throws IOException {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(FIREFOX)
   public void canSetFilesWithElementId() throws IOException {
     driver.get(pages.formPage);
@@ -103,7 +100,6 @@ public void canSetFilesWithElementId() throws IOException {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(FIREFOX)
   void canSetFile() throws IOException {
     driver.get(pages.formPage);
@@ -125,7 +121,6 @@ void canSetFile() throws IOException {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(FIREFOX)
   void canSetFileWithElementId() throws IOException {
     driver.get(pages.formPage);
diff --git a/java/test/org/openqa/selenium/bidi/log/BUILD.bazel b/java/test/org/openqa/selenium/bidi/log/BUILD.bazel
index f7b25cedc6d25..71b67efb132f2 100644
--- a/java/test/org/openqa/selenium/bidi/log/BUILD.bazel
+++ b/java/test/org/openqa/selenium/bidi/log/BUILD.bazel
@@ -7,6 +7,7 @@ java_selenium_test_suite(
     srcs = glob(["*Test.java"]),
     browsers = [
         "chrome",
+        "edge",
         "firefox",
     ],
     tags = [
diff --git a/java/test/org/openqa/selenium/bidi/script/BUILD.bazel b/java/test/org/openqa/selenium/bidi/script/BUILD.bazel
index f7b25cedc6d25..71b67efb132f2 100644
--- a/java/test/org/openqa/selenium/bidi/script/BUILD.bazel
+++ b/java/test/org/openqa/selenium/bidi/script/BUILD.bazel
@@ -7,6 +7,7 @@ java_selenium_test_suite(
     srcs = glob(["*Test.java"]),
     browsers = [
         "chrome",
+        "edge",
         "firefox",
     ],
     tags = [
diff --git a/java/test/org/openqa/selenium/bidi/script/LocalValueTest.java b/java/test/org/openqa/selenium/bidi/script/LocalValueTest.java
index dd95da5350906..aa9dd92a1fcf0 100644
--- a/java/test/org/openqa/selenium/bidi/script/LocalValueTest.java
+++ b/java/test/org/openqa/selenium/bidi/script/LocalValueTest.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.bidi.script;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 import static org.openqa.selenium.testing.drivers.Browser.IE;
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
 
@@ -40,7 +39,6 @@ class LocalValueTest extends JupiterTestBase {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithUndefinedArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -73,7 +71,6 @@ void canCallFunctionWithUndefinedArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithNullArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -106,7 +103,6 @@ void canCallFunctionWithNullArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithMinusZeroArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -141,7 +137,6 @@ void canCallFunctionWithMinusZeroArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithInfinityArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -176,7 +171,6 @@ void canCallFunctionWithInfinityArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithMinusInfinityArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -212,7 +206,6 @@ void canCallFunctionWithMinusInfinityArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithNumberArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -247,7 +240,6 @@ void canCallFunctionWithNumberArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithBooleanArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -282,7 +274,6 @@ void canCallFunctionWithBooleanArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithBigIntArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -317,7 +308,6 @@ void canCallFunctionWithBigIntArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithArrayArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -358,7 +348,6 @@ void canCallFunctionWithArrayArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithSetArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -399,7 +388,6 @@ void canCallFunctionWithSetArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithDateArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -435,7 +423,6 @@ void canCallFunctionWithDateArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithMapArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -478,7 +465,6 @@ void canCallFunctionWithMapArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithObjectArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -521,7 +507,6 @@ void canCallFunctionWithObjectArgument() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithRegExpArgument() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
diff --git a/java/test/org/openqa/selenium/bidi/script/ScriptCommandsTest.java b/java/test/org/openqa/selenium/bidi/script/ScriptCommandsTest.java
index efa79508270a2..bd07b1efa19ec 100644
--- a/java/test/org/openqa/selenium/bidi/script/ScriptCommandsTest.java
+++ b/java/test/org/openqa/selenium/bidi/script/ScriptCommandsTest.java
@@ -21,7 +21,6 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.openqa.selenium.testing.Safely.safelyCall;
 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.IE;
 import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
 
@@ -63,7 +62,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithDeclaration() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -84,7 +82,6 @@ void canCallFunctionWithDeclaration() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithArguments() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -116,7 +113,6 @@ void canCallFunctionWithArguments() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionToGetIFrameBrowsingContext() {
     String url = appServer.whereIs("click_too_big_in_frame.html");
     driver.get(url);
@@ -152,7 +148,6 @@ void canCallFunctionToGetIFrameBrowsingContext() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionToGetElement() {
     String url = appServer.whereIs("/bidi/logEntryAdded.html");
     driver.get(url);
@@ -184,7 +179,6 @@ void canCallFunctionToGetElement() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithAwaitPromise() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -214,7 +208,6 @@ void canCallFunctionWithAwaitPromise() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithAwaitPromiseFalse() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -242,7 +235,6 @@ void canCallFunctionWithAwaitPromiseFalse() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithThisParameter() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -272,7 +264,6 @@ void canCallFunctionWithThisParameter() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithOwnershipRoot() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -297,7 +288,6 @@ void canCallFunctionWithOwnershipRoot() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionWithOwnershipNone() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
@@ -322,7 +312,6 @@ void canCallFunctionWithOwnershipNone() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(CHROME)
   void canCallFunctionThatThrowsException() {
     String id = driver.getWindowHandle();
@@ -342,8 +331,7 @@ void canCallFunctionThatThrowsException() {
 
     EvaluateResultExceptionValue exception = (EvaluateResultExceptionValue) result;
     assertThat(exception.getExceptionDetails().getException().getType()).isEqualTo("error");
-    assertThat(exception.getExceptionDetails().getText())
-        .isEqualTo("SyntaxError: expected expression, got ')'");
+    assertThat(exception.getExceptionDetails().getText()).contains("SyntaxError:");
     assertThat(exception.getExceptionDetails().getLineNumber()).isPositive();
     assertThat(exception.getExceptionDetails().getColumnNumber()).isPositive();
     assertThat(exception.getExceptionDetails().getStacktrace().getCallFrames().size()).isEqualTo(0);
@@ -352,7 +340,6 @@ void canCallFunctionThatThrowsException() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canCallFunctionInASandBox() {
     String id = driver.getWindowHandle();
     Script script = new Script(id, driver);
diff --git a/java/test/org/openqa/selenium/bidi/script/ScriptEventsTest.java b/java/test/org/openqa/selenium/bidi/script/ScriptEventsTest.java
index b80a32bfeb1f3..5f9b499a4d8f6 100644
--- a/java/test/org/openqa/selenium/bidi/script/ScriptEventsTest.java
+++ b/java/test/org/openqa/selenium/bidi/script/ScriptEventsTest.java
@@ -18,11 +18,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.openqa.selenium.testing.Safely.safelyCall;
-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;
-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.util.List;
 import java.util.Optional;
@@ -53,7 +49,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToChannelMessage()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (Script script = new Script(driver)) {
@@ -83,7 +78,6 @@ void canListenToChannelMessage()
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   void canListenToRealmCreatedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (Script script = new Script(driver)) {
diff --git a/java/test/org/openqa/selenium/bidi/storage/BUILD.bazel b/java/test/org/openqa/selenium/bidi/storage/BUILD.bazel
index 96db6d7d060d2..c173e8cffd6cd 100644
--- a/java/test/org/openqa/selenium/bidi/storage/BUILD.bazel
+++ b/java/test/org/openqa/selenium/bidi/storage/BUILD.bazel
@@ -6,8 +6,9 @@ java_selenium_test_suite(
     size = "large",
     srcs = glob(["*Test.java"]),
     browsers = [
-        "chrome",
-        "firefox",
+        #"chrome",
+        "edge",
+        #"firefox",
     ],
     tags = [
         "selenium-remote",
diff --git a/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java b/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java
index 22edfe3629323..01c6942f4428b 100644
--- a/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java
+++ b/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java
@@ -18,11 +18,7 @@
 package org.openqa.selenium.bidi.storage;
 
 import static org.assertj.core.api.Assertions.assertThat;
-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;
-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.time.Instant;
 import java.util.Date;
@@ -66,7 +62,6 @@ public void setUp() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void canGetCookieByName() {
     String key = generateUniqueKey();
     String value = "set";
@@ -87,7 +82,6 @@ public void canGetCookieByName() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   @NotYetImplemented(CHROME)
   @NotYetImplemented(FIREFOX)
   public void canGetCookieInDefaultUserContext() {
@@ -136,7 +130,6 @@ public void canGetCookieInAUserContext() {}
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void canAddCookie() {
     String key = generateUniqueKey();
     String value = "foo";
@@ -225,7 +218,6 @@ public void canAddAndGetCookie() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void canGetAllCookies() {
     String key1 = generateUniqueKey();
     String key2 = generateUniqueKey();
@@ -299,7 +291,6 @@ public void canDeleteCookieWithName() {
   @Test
   @NotYetImplemented(SAFARI)
   @NotYetImplemented(IE)
-  @NotYetImplemented(EDGE)
   public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() {
     driver.get(appServer.whereIs("/common/animals"));