diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncSocketTimeout.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncSocketTimeout.java
index ee17bb9cf1..aae0ecb1b6 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncSocketTimeout.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncSocketTimeout.java
@@ -38,7 +38,6 @@
 import org.apache.hc.core5.http.Method;
 import org.apache.hc.core5.http.URIScheme;
 import org.apache.hc.core5.io.CloseMode;
-import org.apache.hc.core5.util.VersionInfo;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -51,7 +50,6 @@
 import static org.apache.hc.core5.util.ReflectionUtils.determineJRELevel;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 abstract class AbstractTestSocketTimeout extends AbstractIntegrationTestBase {
@@ -83,21 +81,26 @@ void testReadTimeouts(final int connConfigTimeout, final int responseTimeout) th
         }
 
         for (final boolean drip : new boolean[]{ false, true }) {
-            final SimpleHttpRequest request = getRequest(responseTimeout, drip,
-                target);
-
-            final Throwable cause = assertThrows(ExecutionException.class, () -> client.execute(request, null).get())
-                .getCause();
-            assertInstanceOf(SocketTimeoutException.class, cause);
+            for (final boolean reuseConnection : new boolean[]{ false, true }) {
+                if (reuseConnection) {
+                    client.execute(getRequest(2500, 0, false, target), null).get();
+                }
+                final SimpleHttpRequest request = getRequest(responseTimeout, 2500, drip, target);
+
+                final Throwable cause = assertThrows(ExecutionException.class,
+                    () -> client.execute(request, null).get()).getCause();
+                assertInstanceOf(SocketTimeoutException.class, cause,
+                    String.format("drip=%s, reuseConnection=%s", drip, reuseConnection));
+            }
         }
 
         closeClient(client);
     }
 
-    private SimpleHttpRequest getRequest(final int responseTimeout, final boolean drip, final HttpHost target)
-        throws Exception {
+    private SimpleHttpRequest getRequest(final int responseTimeout, final int delay, final boolean drip,
+                                         final HttpHost target) throws Exception {
         final SimpleHttpRequest request = SimpleHttpRequest.create(Method.GET, target,
-            "/random/10240?delay=2500&drip=" + (drip ? 1 : 0));
+            "/random/10240?delay=" + delay + "&drip=" + (drip ? 1 : 0));
         if (responseTimeout > 0) {
             request.setConfig(RequestConfig.custom()
                 .setUnixDomainSocket(getUnixDomainSocket())
@@ -138,13 +141,6 @@ public Uds() {
         @Override
         void checkAssumptions() {
             assumeTrue(determineJRELevel() >= 16, "Async UDS requires Java 16+");
-            final String[] components = VersionInfo
-                .loadVersionInfo("org.apache.hc.core5", getClass().getClassLoader())
-                .getRelease()
-                .split("[-.]");
-            final int majorVersion = Integer.parseInt(components[0]);
-            final int minorVersion = Integer.parseInt(components[1]);
-            assumeFalse(majorVersion <= 5 && minorVersion <= 3, "Async UDS requires HttpCore 5.4+");
         }
     }
 }
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSocketTimeout.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSocketTimeout.java
index 56bd63008e..68743aa681 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSocketTimeout.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSocketTimeout.java
@@ -85,15 +85,21 @@ void testReadTimeouts(final int socketConfigTimeout, final int connConfigTimeout
         }
 
         for (final boolean drip : new boolean[]{ false, true }) {
-            final HttpGet request = getRequest(responseTimeout, drip);
+            for (final boolean reuseConnection : new boolean[]{ false, true }) {
+                if (reuseConnection) {
+                    client.execute(target, getRequest(2500, 0, false), new BasicHttpClientResponseHandler());
+                }
+                final HttpGet request = getRequest(responseTimeout, 2500, drip);
 
-            assertThrows(SocketTimeoutException.class, () ->
-                client.execute(target, request, new BasicHttpClientResponseHandler()));
+                assertThrows(SocketTimeoutException.class, () ->
+                    client.execute(target, request, new BasicHttpClientResponseHandler()),
+                    String.format("drip=%s, reuseConnection=%s", drip, reuseConnection));
+            }
         }
     }
 
-    private HttpGet getRequest(final int responseTimeout, final boolean drip) throws Exception {
-        final HttpGet request = new HttpGet(new URI("/random/10240?delay=2500&drip=" + (drip ? 1 : 0)));
+    private HttpGet getRequest(final int responseTimeout, final int delay, final boolean drip) throws Exception {
+        final HttpGet request = new HttpGet(new URI("/random/10240?delay=" + delay + "&drip=" + (drip ? 1 : 0)));
         if (responseTimeout > 0) {
             request.setConfig(RequestConfig.custom()
                 .setUnixDomainSocket(getUnixDomainSocket())
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
index 1e464d7386..35ecca386f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
@@ -444,6 +444,8 @@ public ConnectionEndpoint get(
                             conn.activate();
                             if (connectionConfig.getSocketTimeout() != null) {
                                 conn.setSocketTimeout(connectionConfig.getSocketTimeout());
+                            } else {
+                                conn.setSocketTimeout(resolveSocketConfig(route).getSoTimeout());
                             }
                         } else {
                             poolEntry.assignConnection(connFactory.createConnection(null));