diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java
index 8e6b998983f3..d405dc2da441 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java
@@ -21,7 +21,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.invoke.MethodHandles;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -455,14 +454,12 @@ public void regenerateStores(X509KeyType keyStoreKeyType, X509KeyType trustStore
   private void createCertificates(String... subjectAltNames)
     throws GeneralSecurityException, IOException, OperatorCreationException {
     X500NameBuilder caNameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
-    caNameBuilder.addRDN(BCStyle.CN,
-      MethodHandles.lookup().lookupClass().getCanonicalName() + " Root CA");
+    caNameBuilder.addRDN(BCStyle.CN, getClass().getSimpleName() + " Root CA");
     trustStoreCertificate =
       X509TestHelpers.newSelfSignedCACert(caNameBuilder.build(), trustStoreKeyPair);
 
     X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
-    nameBuilder.addRDN(BCStyle.CN,
-      MethodHandles.lookup().lookupClass().getCanonicalName() + " Zookeeper Test");
+    nameBuilder.addRDN(BCStyle.CN, getClass().getSimpleName() + " Zookeeper Test");
     keyStoreCertificate = newCert(nameBuilder.build(), subjectAltNames);
   }
 
diff --git a/pom.xml b/pom.xml
index 1470fb905bbc..8491ab28dab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -939,7 +939,7 @@
     <joni.version>2.2.5</joni.version>
     <jcodings.version>1.0.63</jcodings.version>
     <spy.version>2.12.3</spy.version>
-    <bouncycastle.version>1.84</bouncycastle.version>
+    <bouncycastle.version>1.86</bouncycastle.version>
     <skyscreamer.version>1.5.1</skyscreamer.version>
     <commons-crypto.version>1.1.0</commons-crypto.version>
     <!-- Plugin Dependencies -->