diff --git a/src/test/bash/create_certificates.sh b/src/test/bash/create_certificates.sh
index 616a70ab3c..be98469501 100755
--- a/src/test/bash/create_certificates.sh
+++ b/src/test/bash/create_certificates.sh
@@ -124,5 +124,5 @@ openssl pkcs12 -export -clcerts \
 ${KEYTOOL} -importcert -keystore ${TRUSTSTORE_FILE} -file ${CA_DIR}/certs/ca.cert.pem -noprompt -storepass changeit
 ${KEYTOOL} -importkeystore \
                               -srckeystore ${CA_DIR}/client.p12 -srcstoretype PKCS12 -srcstorepass changeit\
-                              -destkeystore ${KEYSTORE_FILE} -deststoretype JKS \
+                              -destkeystore ${KEYSTORE_FILE} -deststoretype PKCS12 \
                               -noprompt -storepass changeit
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
index b6215c7ad7..855f9184d5 100644
--- a/src/test/java/io/lettuce/core/SslIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -24,7 +24,7 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.security.cert.CertificateException;
+import java.security.GeneralSecurityException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
@@ -391,7 +391,7 @@ void pubSubSslAndBreakConnection() {
         RedisFuture<Void> defectFuture = connection.subscribe("foo");
 
         assertThatThrownBy(() -> Futures.await(defectFuture)).hasCauseInstanceOf(DecoderException.class)
-                .hasRootCauseInstanceOf(CertificateException.class);
+                .hasRootCauseInstanceOf(GeneralSecurityException.class);
 
         assertThat(defectFuture.toCompletableFuture()).isDone();