diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
index 56e1647e1ff..579524aa86a 100644
--- a/resteasy-dependencies-bom/pom.xml
+++ b/resteasy-dependencies-bom/pom.xml
@@ -39,7 +39,7 @@
         <version.junit>4.12</version.junit>
         <version.log4j>2.9.1</version.log4j>
         <version.net.jcip.jcip-annotations>1.0</version.net.jcip.jcip-annotations>
-        <version.org.apache.httpcomponents.httpclient>4.5.2</version.org.apache.httpcomponents.httpclient>
+        <version.org.apache.httpcomponents.httpclient>4.5.4</version.org.apache.httpcomponents.httpclient>
         <version.org.apache.httpcomponents.httpcore>4.4.5</version.org.apache.httpcomponents.httpcore>
         <version.org.apache.httpcomponents.httpasyncclient>4.1.3</version.org.apache.httpcomponents.httpasyncclient>
         <version.org.apache.james.apache-mime4j>0.6</version.org.apache.james.apache-mime4j>
diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncTimeoutExceptionsTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncTimeoutExceptionsTest.java
index 78962d40d90..fa9824a46f8 100644
--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncTimeoutExceptionsTest.java
+++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncTimeoutExceptionsTest.java
@@ -105,7 +105,7 @@ private Client prepareHttpClientForMultipleRequests() {
 
         RequestConfig reqConfig = RequestConfig.custom()   // apache HttpClient specific
                 .setConnectTimeout(2000)
-                .setSocketTimeout(2000)
+                .setSocketTimeout(-1)
                 .setConnectionRequestTimeout(200)
                 .build();
         CloseableHttpClient httpClient = HttpClientBuilder.create()