diff --git a/java/test/org/openqa/selenium/remote/http/BUILD.bazel b/java/test/org/openqa/selenium/remote/http/BUILD.bazel
index 95c5f1b49d590..a3dec01d6abd2 100644
--- a/java/test/org/openqa/selenium/remote/http/BUILD.bazel
+++ b/java/test/org/openqa/selenium/remote/http/BUILD.bazel
@@ -5,7 +5,10 @@ load("//java:version.bzl", "TOOLS_JAVA_VERSION")
 java_test_suite(
     name = "small-tests",
     size = "small",
-    srcs = glob(["*.java"]),
+    srcs = glob([
+        "*.java",
+        "jdk/*.java",
+    ]),
     javacopts = [
         "--release",
         TOOLS_JAVA_VERSION,
@@ -15,6 +18,7 @@ java_test_suite(
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/remote/http",
         "//java/test/org/openqa/selenium/environment",
+        "//java/test/org/openqa/selenium/remote/internal:test-lib",
         "//java/test/org/openqa/selenium/testing:annotations",
         artifact("org.assertj:assertj-core"),
         artifact("com.google.guava:guava"),
diff --git a/java/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java b/java/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java
index ded07b80bb433..a50b4c11f75e3 100644
--- a/java/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java
+++ b/java/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java
@@ -208,7 +208,7 @@ public void shouldAllowConfigurationFromSystemProperties() {
     delegate =
         req -> {
           try {
-            Thread.sleep(1100);
+            Thread.sleep(3000);
           } catch (InterruptedException e) {
             throw new RuntimeException(e);
           }
@@ -216,11 +216,11 @@ public void shouldAllowConfigurationFromSystemProperties() {
         };
     try {
       System.setProperty("webdriver.httpclient.connectionTimeout", "1");
-      System.setProperty("webdriver.httpclient.readTimeout", "300");
+      System.setProperty("webdriver.httpclient.readTimeout", "2");
       System.setProperty("webdriver.httpclient.version", "HTTP_1_1");
       ClientConfig clientConfig = ClientConfig.defaultConfig();
       assertThat(clientConfig.connectionTimeout()).isEqualTo(Duration.ofSeconds(1));
-      assertThat(clientConfig.readTimeout()).isEqualTo(Duration.ofSeconds(300));
+      assertThat(clientConfig.readTimeout()).isEqualTo(Duration.ofSeconds(2));
       assertThat(clientConfig.version()).isEqualTo("HTTP_1_1");
       HttpClient client =
           createFactory().createClient(clientConfig.baseUri(URI.create(server.whereIs("/"))));