diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d5559dd..a9b8415 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,8 +13,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
-        jdk: [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
+        os: [ubuntu-20.04, ubuntu-22.04]
+        jdk: [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]
 
     name: Test on ${{ matrix.os }} with JDK ${{ matrix.jdk }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97b9c61..7d405f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## 0.4.2-SNAPSHOT (20XX-XX-XX)
 
-* Upgrade JMH to version `1.35`
-* Explicit support for JDK 15, 16, 17, and 18
+* Upgrade JMH to version `1.37`
+* Explicit support for JDKs 15-21
 * Explicit support for Clojure 1.11
 * Improve error message when benchmark `:name` is invalid Java method identifier ([#10][issue10])
 
diff --git a/deps.edn b/deps.edn
index 893ea94..5b4ecd5 100644
--- a/deps.edn
+++ b/deps.edn
@@ -1,4 +1,4 @@
 {:deps
  {insn/insn {:mvn/version "0.2.1"}
-  org.openjdk.jmh/jmh-core {:mvn/version "1.35"}
-  org.openjdk.jmh/jmh-generator-reflection {:mvn/version "1.35"}}}
+  org.openjdk.jmh/jmh-core {:mvn/version "1.37"}
+  org.openjdk.jmh/jmh-generator-reflection {:mvn/version "1.37"}}}