diff --git a/.skipped-tests b/.skipped-tests
index fba4d59fb1281..edab43e6f1918 100644
--- a/.skipped-tests
+++ b/.skipped-tests
@@ -27,17 +27,12 @@
 -//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
 -//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome
--//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
 -//rb/spec/integration/selenium/webdriver/edge:service-edge
--//rb/spec/integration/selenium/webdriver/edge:service-edge-bidi
 -//rb/spec/integration/selenium/webdriver/edge:service-edge-remote
--//rb/spec/integration/selenium/webdriver/firefox:driver-firefox-beta-bidi
 -//rb/spec/integration/selenium/webdriver/firefox:service-firefox
 -//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta
--//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-bidi
 -//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-remote
--//rb/spec/integration/selenium/webdriver/firefox:service-firefox-bidi
 -//rb/spec/integration/selenium/webdriver/firefox:service-firefox-remote
 -//rb/spec/integration/selenium/webdriver/remote:driver-chrome-remote
 -//rb/spec/integration/selenium/webdriver/remote:driver-edge-remote
@@ -49,6 +44,5 @@
 -//rb/spec/integration/selenium/webdriver/remote:element-firefox-remote
 -//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote
 -//rb/spec/integration/selenium/webdriver:element-chrome
--//rb/spec/integration/selenium/webdriver:element-chrome-bidi
 -//rb/spec/integration/selenium/webdriver:element-chrome-remote
 -//rb:lint
diff --git a/rb/spec/integration/selenium/webdriver/BUILD.bazel b/rb/spec/integration/selenium/webdriver/BUILD.bazel
index c420436e6bdbd..f786bb224308f 100644
--- a/rb/spec/integration/selenium/webdriver/BUILD.bazel
+++ b/rb/spec/integration/selenium/webdriver/BUILD.bazel
@@ -42,19 +42,30 @@ rb_library(
             "driver_spec.rb",
             "devtools_spec.rb",
             "element_spec.rb",
+            "navigation_spec.rb",
+            "network_spec.rb",
         ],
     )
 ]
 
-rb_integration_test(
-    name = "bidi",
-    srcs = ["bidi_spec.rb"],
-    tags = ["exclusive-if-local"],
-    deps = [
-        "//rb/lib/selenium/devtools",
-        "//rb/lib/selenium/webdriver:bidi",
-    ],
-)
+_BIDI_FILES = [
+    "bidi_spec.rb",
+    "navigation_spec.rb",
+    "network_spec.rb",
+]
+
+[
+    rb_integration_test(
+        name = f[:-8],
+        srcs = [f],
+        tags = ["bidi"],
+        deps = [
+            "//rb/lib/selenium/devtools",
+            "//rb/lib/selenium/webdriver:bidi",
+        ],
+    )
+    for f in _BIDI_FILES
+]
 
 rb_integration_test(
     name = "devtools",
diff --git a/rb/spec/integration/selenium/webdriver/bidi/BUILD.bazel b/rb/spec/integration/selenium/webdriver/bidi/BUILD.bazel
index 4b317a1a7929a..7cb22df532822 100644
--- a/rb/spec/integration/selenium/webdriver/bidi/BUILD.bazel
+++ b/rb/spec/integration/selenium/webdriver/bidi/BUILD.bazel
@@ -4,7 +4,10 @@ load("//rb/spec:tests.bzl", "rb_integration_test")
     rb_integration_test(
         name = file[:-8],
         srcs = [file],
-        tags = ["exclusive-if-local"],
+        tags = [
+            "bidi",
+            "exclusive-if-local",
+        ],
         deps = [
             "//rb/lib/selenium/devtools",
             "//rb/lib/selenium/webdriver:bidi",
diff --git a/rb/spec/tests.bzl b/rb/spec/tests.bzl
index accd038d01427..8b646ec7542a8 100644
--- a/rb/spec/tests.bzl
+++ b/rb/spec/tests.bzl
@@ -214,24 +214,25 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke
             target_compatible_with = BROWSERS[browser]["target_compatible_with"],
         )
 
-        # Generate a test target for bidi browser execution.
-        rb_test(
-            name = "{}-{}-bidi".format(name, browser),
-            size = "large",
-            srcs = srcs,
-            args = ["rb/spec/"],
-            data = BROWSERS[browser]["data"] + data + ["//common/src/web"],
-            env = BROWSERS[browser]["env"] | {"WEBDRIVER_BIDI": "true"},
-            main = "@bundle//bin:rspec",
-            tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-bidi".format(browser)],
-            deps = depset(
-                ["//rb/spec/integration/selenium/webdriver:spec_helper", "//rb/lib/selenium/webdriver:bidi"] +
-                BROWSERS[browser]["deps"] +
-                deps,
-            ),
-            visibility = ["//rb:__subpackages__"],
-            target_compatible_with = BROWSERS[browser]["target_compatible_with"],
-        )
+        # Generate a test target for bidi browser execution if there is a matching tag
+        if "bidi" in tags:
+            rb_test(
+                name = "{}-{}-bidi".format(name, browser),
+                size = "large",
+                srcs = srcs,
+                args = ["rb/spec/"],
+                data = BROWSERS[browser]["data"] + data + ["//common/src/web"],
+                env = BROWSERS[browser]["env"] | {"WEBDRIVER_BIDI": "true"},
+                main = "@bundle//bin:rspec",
+                tags = COMMON_TAGS + BROWSERS[browser]["tags"] + tags + ["{}-bidi".format(browser)],
+                deps = depset(
+                    ["//rb/spec/integration/selenium/webdriver:spec_helper", "//rb/lib/selenium/webdriver:bidi"] +
+                    BROWSERS[browser]["deps"] +
+                    deps,
+                ),
+                visibility = ["//rb:__subpackages__"],
+                target_compatible_with = BROWSERS[browser]["target_compatible_with"],
+            )
 
 def rb_unit_test(name, srcs, deps, data = []):
     rb_test(