diff --git a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java b/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java
index c63e2f153eaf1..bdd31b5423db3 100644
--- a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java
+++ b/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java
@@ -89,14 +89,6 @@ public static Optional<URI> getReportedUri(Capabilities caps) {
       case "msedge":
         key = "ms:edgeOptions";
         break;
-      case "firefox":
-        key = "moz:debuggerAddress";
-        if (!caps.is("webSocketUrl")) {
-          LOG.warning(
-              "CDP support for Firefox is deprecated and will be removed in future versions. "
-                  + "Please switch to WebDriver BiDi.");
-        }
-        break;
       default:
         return Optional.empty();
     }
diff --git a/java/src/org/openqa/selenium/firefox/BUILD.bazel b/java/src/org/openqa/selenium/firefox/BUILD.bazel
index a52aa9066d4d1..e4c1f17455d61 100644
--- a/java/src/org/openqa/selenium/firefox/BUILD.bazel
+++ b/java/src/org/openqa/selenium/firefox/BUILD.bazel
@@ -13,7 +13,6 @@ java_export(
     deps = [
         "//java:auto-service",
         "//java/src/org/openqa/selenium/bidi",
-        "//java/src/org/openqa/selenium/devtools/v85",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",
diff --git a/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java b/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java
index 2fe59f90df625..f008d1fb5c86f 100644
--- a/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java
+++ b/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java
@@ -490,13 +490,13 @@ public URL getUrl() {
                             SESSION_ID,
                             "capabilities",
                             new ImmutableCapabilities(
-                                "firefox", "caps",
-                                "browserName", "firefox",
-                                "moz:debuggerAddress", uri.toString())))));
+                                "chrome", "caps",
+                                "browserName", "chrome",
+                                "goog:chromeOptions", uri.toString())))));
 
     WebDriver driver =
         RemoteWebDriver.builder()
-            .oneOf(new FirefoxOptions())
+            .oneOf(new ChromeOptions())
             .withDriverService(service)
             .augmentUsing(new Augmenter())
             .connectingWith(config -> req -> response)