diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0c2b40..fdded2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Update dependency io.cucumber:query to v14.0.1
 
 ## [0.5.0] - 2025-07-17
 ### Added
diff --git a/java/pom.xml b/java/pom.xml
index 714badc..9126bfa 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -59,12 +59,12 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>messages</artifactId>
-            <version>[24.0.0,29.0.0)</version>
+            <version>[29.0.1,30.0.0)</version>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>query</artifactId>
-            <version>[13.3.0,14.0.0)</version>
+            <version>[14.0.1,15.0.0)</version>
         </dependency>
 
         <dependency>
diff --git a/java/src/main/java/io/cucumber/testngxmlformatter/XmlReportData.java b/java/src/main/java/io/cucumber/testngxmlformatter/XmlReportData.java
index c72ea3b..c9c880b 100644
--- a/java/src/main/java/io/cucumber/testngxmlformatter/XmlReportData.java
+++ b/java/src/main/java/io/cucumber/testngxmlformatter/XmlReportData.java
@@ -15,6 +15,7 @@
 import io.cucumber.query.Lineage;
 import io.cucumber.query.NamingStrategy;
 import io.cucumber.query.Query;
+import io.cucumber.query.Repository;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -29,6 +30,7 @@
 import java.util.Set;
 
 import static io.cucumber.messages.types.TestStepResultStatus.PASSED;
+import static io.cucumber.query.Repository.RepositoryFeature.INCLUDE_GHERKIN_DOCUMENTS;
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.naturalOrder;
 import static java.util.Comparator.nullsFirst;
@@ -42,7 +44,10 @@ class XmlReportData {
             new io.cucumber.messages.types.Duration(0L, 0L);
     // By definition, but see https://github.com/cucumber/gherkin/issues/11
     private static final TestStepResult SCENARIO_WITH_NO_STEPS = new TestStepResult(ZERO_DURATION, null, PASSED, null);
-    final Query query = new Query();
+    private final Repository repository = Repository.builder()
+            .feature(INCLUDE_GHERKIN_DOCUMENTS, true)
+            .build();
+    private final Query query = new Query(repository);
     private final NamingStrategy namingStrategy;
 
     XmlReportData(NamingStrategy namingStrategy) {
@@ -50,7 +55,7 @@ class XmlReportData {
     }
 
     void collect(Envelope envelope) {
-        query.update(envelope);
+        repository.update(envelope);
     }
 
     long getSuiteDurationInMilliSeconds() {