diff --git a/src/test/resources/client-keystore.jks b/src/test/resources/client-keystore.jks
index 608c260b..7b2a27f9 100644
Binary files a/src/test/resources/client-keystore.jks and b/src/test/resources/client-keystore.jks differ
diff --git a/src/test/resources/client.cer b/src/test/resources/client.cer
index fca6e51e..c28fc25f 100644
Binary files a/src/test/resources/client.cer and b/src/test/resources/client.cer differ
diff --git a/src/test/resources/generate.sh b/src/test/resources/generate.sh
index b88685e6..cb0f5721 100755
--- a/src/test/resources/generate.sh
+++ b/src/test/resources/generate.sh
@@ -18,21 +18,21 @@ deleteFile client.cer
 
 dname="CN=localhost, OU=Server Unit, O=Red Hat, L=Raleigh, S=NC, C=US"
 # Create server keystore - file server-keystore.jks
-keytool -genkey -v -alias server -keystore server-keystore.jks -validity 3650 -keypass testpassword -storepass testpassword -dname "${dname}"
+keytool -genkey -v -alias server -keystore server-keystore.jks -keyalg RSA -validity 3650 -keypass testpassword -storepass testpassword -dname "${dname}"
 
 # Export Server's Public Key - file server.cer
 keytool -export -keystore server-keystore.jks -alias server -file server.cer -keypass testpassword -storepass testpassword
 
 # Export Client Key Store - file client-keystore.jsk
-keytool -genkey -v -alias client -keystore client-keystore.jks -validity 3650 -keypass testpassword -storepass testpassword -dname "${dname}"
+keytool -genkey -v -alias client -keystore client-keystore.jks -keyalg RSA -validity 3650 -keypass testpassword -storepass testpassword -dname "${dname}"
 
 # Exporting Client's Public Key - file client.cer
 keytool -export -keystore client-keystore.jks -alias client -file client.cer -keypass testpassword -storepass testpassword
 
 # Importing Client's Public key into server's truststore
-keytool -import -v -trustcacerts -alias client -file client.cer -keystore server-keystore.jks -keypass testpassword -storepass testpassword
+keytool -import -v -trustcacerts -alias client -file client.cer -keystore server-keystore.jks -keypass testpassword -storepass testpassword -noprompt
 
 # Importing Server's Public key into client's truststore
-keytool -import -v -trustcacerts -alias server -file server.cer -keystore client-keystore.jks -keypass testpassword -storepass testpassword
+keytool -import -v -trustcacerts -alias server -file server.cer -keystore client-keystore.jks -keypass testpassword -storepass testpassword -noprompt
 
 popd
diff --git a/src/test/resources/server-keystore.jks b/src/test/resources/server-keystore.jks
index d6a6adfd..0e0ea166 100644
Binary files a/src/test/resources/server-keystore.jks and b/src/test/resources/server-keystore.jks differ
diff --git a/src/test/resources/server.cer b/src/test/resources/server.cer
index e5c2b91b..206f4d9a 100644
Binary files a/src/test/resources/server.cer and b/src/test/resources/server.cer differ