diff --git a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java
index d15f8138c83..08678e46416 100644
--- a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java
+++ b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java
@@ -61,6 +61,7 @@ public Response execute(ElasticsearchRequest request) throws IOException {
 			);
 		}
 		catch (ResponseException e) {
+			requestLog.debug( "ES client issued a ResponseException - not necessarily a problem", e );
 			/*
 			 * The client tries to guess what's an error and what's not, but it's too naive.
 			 * A 404 on DELETE is not always important to us, for instance.
diff --git a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java
index b89a8e628a4..3506e40bd42 100644
--- a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java
+++ b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java
@@ -147,6 +147,7 @@ private HttpAsyncClientBuilder customizeHttpClientConfig(String propertyPrefix,
 
 	private RequestConfig.Builder customizeRequestConfig(String propertyPrefix, Properties properties, RequestConfig.Builder builder) {
 		return builder
+				.setConnectionRequestTimeout( 0 ) //Disable lease handling for the connection pool! See also HSEARCH-2681
 				.setSocketTimeout( ConfigurationParseHelper.getIntValue(
 						properties,
 						propertyPrefix + ElasticsearchEnvironment.SERVER_READ_TIMEOUT,
diff --git a/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java b/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java
index ef7edae19be..1ed383b9e5e 100644
--- a/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java
+++ b/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java
@@ -21,7 +21,7 @@
  *<p>Adapt the classname filter as needed to run a single test or an entire test package.
  *
  * <p>Running such tests from the IDE will require having an Elasticsearch
- * node running. You can easily start one by running 'mvn elasticsearch:run'
+ * node running. You can easily start one by running 'mvn elasticsearch:runforked'
  * from the elasticsearch module in this project.
  *
  * @author Gunnar Morling