diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b4738a..95d99ca 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]
+### Changed
+- Require messages v31 or greater ([#30](https://github.com/cucumber/javascript-core/pull/30))
 
 ## [0.6.0] - 2025-11-17
 ### Added
diff --git a/package-lock.json b/package-lock.json
index ea26523..7fd8e9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,8 @@
       "license": "MIT",
       "devDependencies": {
         "@cucumber/cucumber-expressions": "^18.0.1",
-        "@cucumber/gherkin": "^36.0.0",
-        "@cucumber/messages": "^30.0.0",
+        "@cucumber/gherkin": "^37.0.0",
+        "@cucumber/messages": "^31.0.0",
         "@cucumber/query": "^14.0.0",
         "@cucumber/tag-expressions": "^8.0.0",
         "@eslint/js": "^9.31.0",
@@ -37,7 +37,7 @@
       },
       "peerDependencies": {
         "@cucumber/cucumber-expressions": "*",
-        "@cucumber/messages": "*",
+        "@cucumber/messages": ">=31.0.0",
         "@cucumber/query": "*",
         "@cucumber/tag-expressions": "*"
       }
@@ -76,19 +76,19 @@
       }
     },
     "node_modules/@cucumber/gherkin": {
-      "version": "36.0.0",
-      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-36.0.0.tgz",
-      "integrity": "sha512-L/WomevUuGSHWeJqLN9yEsz37ns0M1BiRu8Isp+hlYTBAYzt6ZkLiUEK3W9gT5STu++lL/2tE04bD8Ma1p0AYw==",
+      "version": "37.0.0",
+      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-37.0.0.tgz",
+      "integrity": "sha512-vKJVJ6h4HCktG870wgYUUskNpFxbFI0WmAkVLPTz1LlLwJX7/KOBqFcr2/L3u0pPoHjbLRW+IpbiXLT2T13/wg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cucumber/messages": ">=19.1.4 <31"
+        "@cucumber/messages": ">=31.0.0 <32"
       }
     },
     "node_modules/@cucumber/messages": {
-      "version": "30.0.0",
-      "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-30.0.0.tgz",
-      "integrity": "sha512-Q49dy57Iv58sTU4z3I9FU0mfCOk/6akuqiANr99eWzX2hBuywbsrGSwi6nEAisLJwiKvSK/kKxlo/YQPegjkEA==",
+      "version": "31.0.0",
+      "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-31.0.0.tgz",
+      "integrity": "sha512-Dqhatp4AjMsH9SREfWz3Q8nlGuwJMTW7YAW5L3OzRId86ZUEu/a8vIL1RO2c0agQefuBS2SVH9fEZ66ovrMYRA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
diff --git a/package.json b/package.json
index 2c5aec6..028e9c3 100644
--- a/package.json
+++ b/package.json
@@ -32,14 +32,14 @@
   "homepage": "https://github.com/cucumber/javascript-core#readme",
   "peerDependencies": {
     "@cucumber/cucumber-expressions": "*",
-    "@cucumber/messages": "*",
+    "@cucumber/messages": ">=31.0.0",
     "@cucumber/query": "*",
     "@cucumber/tag-expressions": "*"
   },
   "devDependencies": {
     "@cucumber/cucumber-expressions": "^18.0.1",
-    "@cucumber/gherkin": "^36.0.0",
-    "@cucumber/messages": "^30.0.0",
+    "@cucumber/gherkin": "^37.0.0",
+    "@cucumber/messages": "^31.0.0",
     "@cucumber/query": "^14.0.0",
     "@cucumber/tag-expressions": "^8.0.0",
     "@eslint/js": "^9.31.0",
diff --git a/src/makeTestPlan.ts b/src/makeTestPlan.ts
index 5089405..3eea244 100644
--- a/src/makeTestPlan.ts
+++ b/src/makeTestPlan.ts
@@ -49,7 +49,7 @@ export function makeTestPlan(
     name: gherkinDocument.feature?.name || gherkinDocument.uri,
     testCases: pickles.map((pickle) => {
       const lineage = query.findLineageBy(pickle) as Lineage
-      const location = query.findLocationOf(pickle) as MessagesLocation
+      const location = pickle.location as MessagesLocation
       return {
         id: newId(),
         pickleId: pickle.id,