diff --git a/cli/benches/benchmark.rs b/cli/benches/benchmark.rs
index efb73f3a..ae82081a 100644
--- a/cli/benches/benchmark.rs
+++ b/cli/benches/benchmark.rs
@@ -104,6 +104,7 @@ fn main() {
 
             parse(&path, max_path_length, |source| {
                 Query::new(language, str::from_utf8(source).unwrap())
+                    .with_context(|| format!("Query file path: {path:?}"))
                     .expect("Failed to parse query");
             });
         }
diff --git a/script/fetch-fixtures b/script/fetch-fixtures
index 8d21193e..eb66d314 100755
--- a/script/fetch-fixtures
+++ b/script/fetch-fixtures
@@ -23,7 +23,7 @@ fetch_grammar() {
 
 fetch_grammar bash              master
 fetch_grammar c                 master
-fetch_grammar cpp               master
+fetch_grammar cpp               670404d7c689be1c868a46f919ba2a3912f2b7ef
 fetch_grammar embedded-template master
 fetch_grammar go                master
 fetch_grammar html              master
diff --git a/script/fetch-fixtures.cmd b/script/fetch-fixtures.cmd
index 3dad731f..5e8b6a16 100644
--- a/script/fetch-fixtures.cmd
+++ b/script/fetch-fixtures.cmd
@@ -2,7 +2,7 @@
 
 call:fetch_grammar bash              master
 call:fetch_grammar c                 master
-call:fetch_grammar cpp               master
+call:fetch_grammar cpp               670404d7c689be1c868a46f919ba2a3912f2b7ef
 call:fetch_grammar embedded-template master
 call:fetch_grammar go                master
 call:fetch_grammar html              master