diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f08348..9ba5b5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Changed
-- Update dependency cucumber/query  to ^13.3.0 ([#77](https://github.com/cucumber/junit-xml-formatter/pull/77))
-- Update dependency io.cucumber:query up to v13.5
+- Update dependency cucumber/query  to 14.0.1
+- Update dependency io.cucumber:query up to v14.0.1
 
 ### Fixed
 - Remove unnecessary coupling to `node:assert` ([#77](https://github.com/cucumber/junit-xml-formatter/pull/77))
diff --git a/java/pom.xml b/java/pom.xml
index f4a7a92..075ecb3 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,15.0.0)</version>
+            <version>[14.0.1,15.0.0)</version>
         </dependency>
 
         <dependency>
diff --git a/java/src/main/java/io/cucumber/junitxmlformatter/XmlReportData.java b/java/src/main/java/io/cucumber/junitxmlformatter/XmlReportData.java
index fffaeb5..61bbea3 100644
--- a/java/src/main/java/io/cucumber/junitxmlformatter/XmlReportData.java
+++ b/java/src/main/java/io/cucumber/junitxmlformatter/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.util.AbstractMap.SimpleEntry;
@@ -25,13 +26,17 @@
 import java.util.Optional;
 
 import static io.cucumber.messages.types.TestStepResultStatus.PASSED;
+import static io.cucumber.query.Repository.RepositoryFeature.INCLUDE_GHERKIN_DOCUMENTS;
 import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.toList;
 
 class XmlReportData {
 
-    private 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;
 
     private static final long MILLIS_PER_SECOND = SECONDS.toMillis(1L);
@@ -41,7 +46,7 @@ class XmlReportData {
     }
 
     void collect(Envelope envelope) {
-        query.update(envelope);
+        repository.update(envelope);
     }
 
     double getSuiteDurationInSeconds() {
diff --git a/javascript/package-lock.json b/javascript/package-lock.json
index 188affd..cb60187 100644
--- a/javascript/package-lock.json
+++ b/javascript/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.8.1",
       "license": "MIT",
       "dependencies": {
-        "@cucumber/query": "^14.0.0",
+        "@cucumber/query": "^14.0.1",
         "@teppeis/multimaps": "^3.0.0",
         "luxon": "^3.5.0",
         "xmlbuilder": "^15.1.1"
diff --git a/javascript/package.json b/javascript/package.json
index b4be1fc..f6e08e4 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -22,7 +22,7 @@
     "prepublishOnly": "tsc --build tsconfig.build.json"
   },
   "dependencies": {
-    "@cucumber/query": "^14.0.0",
+    "@cucumber/query": "^14.0.1",
     "@teppeis/multimaps": "^3.0.0",
     "luxon": "^3.5.0",
     "xmlbuilder": "^15.1.1"