diff --git a/java/client/src/com/thoughtworks/selenium/BUILD.bazel b/java/client/src/com/thoughtworks/selenium/BUILD.bazel
index f1e316e1ec0ea..3857d1c27295d 100644
--- a/java/client/src/com/thoughtworks/selenium/BUILD.bazel
+++ b/java/client/src/com/thoughtworks/selenium/BUILD.bazel
@@ -29,6 +29,7 @@ java_library(
         "//java/client/src/com/thoughtworks/selenium:__subpackages__",
         "//java/client/test/com/thoughtworks/selenium:__subpackages__",
         "//java/server/src/com/thoughtworks/selenium:__subpackages__",
+        "//java/server/src/org/openqa/selenium/server/htmlrunner:__pkg__",
         "//java/server/test/com/thoughtworks/selenium:__subpackages__",
     ],
     exports = [
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/BUILD.bazel b/java/client/src/com/thoughtworks/selenium/webdriven/BUILD.bazel
index 5ec0fce352bea..c87e6a56b2984 100644
--- a/java/client/src/com/thoughtworks/selenium/webdriven/BUILD.bazel
+++ b/java/client/src/com/thoughtworks/selenium/webdriven/BUILD.bazel
@@ -41,6 +41,7 @@ java_library(
         "//java/server/src/com/thoughtworks/selenium/webdriven:__pkg__",
         "//java/server/src/org/openqa/grid/selenium:__pkg__",
         "//java/server/src/org/openqa/selenium/server/htmlrunner:__pkg__",
+        "//java/server/src/org/openqa/selenium/server/htmlrunner:__pkg__",
     ],
     exports = [
         ":emulation-api",
diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel b/java/server/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel
new file mode 100644
index 0000000000000..75ca10af795d2
--- /dev/null
+++ b/java/server/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel
@@ -0,0 +1,26 @@
+java_binary(
+    name = "selenium-runner",
+    main_class = "org.openqa.selenium.server.htmlrunner.HTMLLauncher",
+    runtime_deps = [
+        ":htmlrunner",
+    ],
+)
+
+java_library(
+    name = "htmlrunner",
+    srcs = glob(["*.java"]),
+    deps = [
+        "//java/client/src/com/thoughtworks/selenium",
+        "//java/client/src/org/openqa/selenium/chrome",
+        "//java/client/src/org/openqa/selenium/edge",
+        "//java/client/src/org/openqa/selenium/firefox",
+        "//java/client/src/org/openqa/selenium/ie",
+        "//java/client/src/org/openqa/selenium/opera",
+        "//java/client/src/org/openqa/selenium/remote",
+        "//java/client/src/org/openqa/selenium/safari",
+        "//java/client/src/com/thoughtworks/selenium/webdriven",
+        "//third_party/java/beust:jcommander",
+        "//third_party/java/guava",
+        "//third_party/java/jetty",
+    ],
+)