diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml
index cc656742444..83b80273109 100644
--- a/jetty-keystore/pom.xml
+++ b/jetty-keystore/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.keystore</bundle-symbolic-name>
-    <bouncycastle.version>1.69</bouncycastle.version>
+    <bouncycastle.version>1.70</bouncycastle.version>
   </properties>
 
   <dependencies>
@@ -27,6 +27,11 @@
       <artifactId>bcprov-jdk15on</artifactId>
       <version>${bouncycastle.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcutil-jdk15on</artifactId>
+      <version>${bouncycastle.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
diff --git a/jetty-keystore/src/main/config/modules/test-keystore.mod b/jetty-keystore/src/main/config/modules/test-keystore.mod
index dca5a651831..954a644a635 100644
--- a/jetty-keystore/src/main/config/modules/test-keystore.mod
+++ b/jetty-keystore/src/main/config/modules/test-keystore.mod
@@ -12,17 +12,19 @@ ssl
 [files]
 maven://org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}|lib/bouncycastle/bcpkix-jdk15on-${bouncycastle.version}.jar
 maven://org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}|lib/bouncycastle/bcprov-jdk15on-${bouncycastle.version}.jar
+maven://org.bouncycastle/bcutil-jdk15to18/${bouncycastle.version}|lib/bouncycastle/bcutil-jdk15on-${bouncycastle.version}.jar
 
 [lib]
 lib/jetty-keystore-${jetty.version}.jar
 lib/bouncycastle/bcpkix-jdk15on-${bouncycastle.version}.jar
 lib/bouncycastle/bcprov-jdk15on-${bouncycastle.version}.jar
+lib/bouncycastle/bcutil-jdk15on-${bouncycastle.version}.jar
 
 [xml]
 etc/jetty-test-keystore.xml
 
 [ini]
-bouncycastle.version?=1.62
+bouncycastle.version?=@bouncycastle.version@
 jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/bouncycastle/
 jetty.sslContext.keyStorePath?=etc/test-keystore.p12
 jetty.sslContext.keyStoreType?=PKCS12