diff --git a/README.md b/README.md
index bb2656b8773..8ea33406d32 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,7 @@ Note: This store requires a [job to aggregate](https://github.com/openzipkin/zip
 
 ### Elasticsearch
 The [Elasticsearch](zipkin-server#elasticsearch-storage) component uses
-Elasticsearch 5+ features, but is tested against Elasticsearch 6-7.x.
+Elasticsearch 5+ features, but is tested against Elasticsearch 7-8.x.
 
 It stores spans as Zipkin v2 json so that integration with other tools is
 straightforward. To help with scale, this uses a combination of custom
diff --git a/docker/examples/README.md b/docker/examples/README.md
index 046e743faf2..50c962f070f 100644
--- a/docker/examples/README.md
+++ b/docker/examples/README.md
@@ -54,7 +54,7 @@ $ docker-compose -f docker-compose-cassandra.yml run --rm --no-deps --entrypoint
 
 ## Elasticsearch
 
-You can store traces in [Elasticsearch](../test-images/zipkin-elasticsearch7/README.md) instead of memory,
+You can store traces in [Elasticsearch](../test-images/zipkin-elasticsearch8/README.md) instead of memory,
 using the `docker-compose-elasticsearch.yml` file. This configuration starts `zipkin`,
 `zipkin-elasticsearch` and `zipkin-dependencies` (cron job) in their own containers.
 
diff --git a/docker/examples/docker-compose-elasticsearch.yml b/docker/examples/docker-compose-elasticsearch.yml
index 56bda4ea942..b20229e748f 100644
--- a/docker/examples/docker-compose-elasticsearch.yml
+++ b/docker/examples/docker-compose-elasticsearch.yml
@@ -22,7 +22,7 @@ version: '2.4'
 
 services:
   storage:
-    image: ghcr.io/openzipkin/zipkin-elasticsearch7:${TAG:-latest}
+    image: ghcr.io/openzipkin/zipkin-elasticsearch8:${TAG:-latest}
     container_name: elasticsearch
     # Uncomment to expose the storage port for testing
     # ports:
diff --git a/zipkin-server/README.md b/zipkin-server/README.md
index a5479a8c601..c2d1532c673 100644
--- a/zipkin-server/README.md
+++ b/zipkin-server/README.md
@@ -247,7 +247,7 @@ $ STORAGE_TYPE=cassandra3 java -jar zipkin.jar \
 
 ### Elasticsearch Storage
 Zipkin's [Elasticsearch storage component](../zipkin-storage/elasticsearch)
-supports versions 5-7.x and applies when `STORAGE_TYPE` is set to `elasticsearch`
+supports versions 7-8.x and applies when `STORAGE_TYPE` is set to `elasticsearch`
 
 The following apply when `STORAGE_TYPE` is set to `elasticsearch`:
 
diff --git a/zipkin-storage/elasticsearch/README.md b/zipkin-storage/elasticsearch/README.md
index 6994c4af105..d555f29c636 100644
--- a/zipkin-storage/elasticsearch/README.md
+++ b/zipkin-storage/elasticsearch/README.md
@@ -3,13 +3,13 @@
 This is a plugin to the Elasticsearch storage component, which uses
 HTTP by way of [Armeria](https://github.com/line/armeria) and
 [Jackson](https://github.com/FasterXML/jackson). This uses Elasticsearch 5+
-features, but is tested against Elasticsearch 6-7.x.
+features, but is tested against Elasticsearch 7-8.x.
 
 ## Multiple hosts
 Most users will supply a DNS name that's mapped to multiple A or AAAA
 records. For example, `http://elasticsearch:9200` will use normal host
 lookups to get the list of IP addresses, though you can alternatively supply
-a list of http base urls. In either case, all of the resolved IP addresses
+a list of http base urls. In either case, all the resolved IP addresses
 from all provided hosts will be iterated over round-robin, with requests made
 only to healthy addresses.
 
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
deleted file mode 100644
index ec63b371168..00000000000
--- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2015-2020 The OpenZipkin Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package zipkin2.elasticsearch.integration;
-
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class ITElasticsearchStorageV6 extends ITElasticsearchStorage {
-
-  @RegisterExtension ElasticsearchExtension elasticsearch = new ElasticsearchExtension(6);
-
-  @Override ElasticsearchExtension elasticsearch() {
-    return elasticsearch;
-  }
-}