diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 7264838559..30f518afe5 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -660,13 +660,13 @@
       <dependency>
         <groupId>org.openjdk.jmh</groupId>
         <artifactId>jmh-core</artifactId>
-        <version>1.21</version>
+        <version>1.36</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.openjdk.jmh</groupId>
         <artifactId>jmh-generator-annprocess</artifactId>
-        <version>1.21</version>
+        <version>1.36</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/CHANGES.txt b/CHANGES.txt
index bda248627e..df38dc8f6a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 5.1
 Merged from 5.0:
+ * Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696)
  * Add guardrail for vector dimensions (CASSANDRA-18730)
 Merged from 4.1:
 Merged from 4.0: