diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42fcb8d166..d06bd4bc47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,11 +13,12 @@ All notable changes to this project will be documented in this file based on the
 * Added support for pipeline when indexing document. [#1455](https://github.com/ruflin/Elastica/pull/1455)
 * Added support for multiple bucket sort orders for aggregations. [#1480](https://github.com/ruflin/Elastica/pull/1480)
 * Added basic support for the Elasticsearch Task Api
-* Added updateByQuery endpoint. [#1499](https://github.com/ruflin/Elastica/pull/1499) 
+* Added updateByQuery endpoint. [#1499](https://github.com/ruflin/Elastica/pull/1499)
 
 ### Improvements
 
 * Use `source` script field instead of deprecated (since ES 5.6) `inline` field. [#1497](https://github.com/ruflin/Elastica/pull/1497)
+* Updated Elasticsearch testing version to 6.2.4.
 
 ### Deprecated
 
diff --git a/README.md b/README.md
index ab20762c0f..2cf6ad5a32 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ All library issues should go to the [issue tracker from github](https://github.c
 
 Compatibility
 -------------
-This release is compatible with all Elasticsearch 6.x releases. It was tested with version 6.0.0.
+This release is compatible with all Elasticsearch 6.x releases. It was tested with version 6.2.4.
 
 
 Contributing
diff --git a/env/elasticsearch/Dockerfile b/env/elasticsearch/Dockerfile
index 26eee0721f..d6a7b8714b 100644
--- a/env/elasticsearch/Dockerfile
+++ b/env/elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.2.4
 MAINTAINER Nicolas Ruflin <spam@ruflin.com>
 
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment