diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java index 74f3e30d63840..c6e2dbb82a884 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java @@ -57,9 +57,9 @@ protected Collection> getPlugins() { } @Override - protected Settings indexSettings() { + protected Settings createTestIndexSettings() { return Settings.builder() - .put(super.indexSettings()) + .put(super.createTestIndexSettings()) .put("index.version.created", Version.V_5_6_0) // legacy needs multi type .build(); } diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java index 660cbf291c801..4bd3430691e24 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java @@ -255,7 +255,7 @@ public void testRequiredParameters() { public void testFromJsonNoDocumentType() throws IOException { QueryShardContext queryShardContext = createShardContext(); QueryBuilder queryBuilder = parseQuery("{\"percolate\" : { \"document\": {}, \"field\":\"" + queryField + "\"}}"); - if (indexVersionCreated.before(Version.V_6_0_0_alpha1)) { + if (indexSettings().getIndexVersionCreated().before(Version.V_6_0_0_alpha1)) { IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> queryBuilder.toQuery(queryShardContext)); assertThat(e.getMessage(), equalTo("[percolate] query is missing required [document_type] parameter"));