diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in b/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in
index a9bbc864c67..b74bb0d1b18 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in
+++ b/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in
@@ -1,6 +1,6 @@
-com.sun.management.jmxremote.ssl.enabled.cipher.suites=SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5
-com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1
+com.sun.management.jmxremote.ssl.enabled.cipher.suites=TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384
+com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1,TLSv1.1,TLSv1.2,TLSv1.3
 com.sun.management.jmxremote.ssl.need.client.auth=true
 com.sun.management.jmxremote.ssl.config.file=@TEST-SRC@/jmxremote_ssltest11_ok.ssl
 com.sun.management.jmxremote.authenticate=false
-javax.rmi.ssl.client.enabledCipherSuites=SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5
+javax.rmi.ssl.client.enabledCipherSuites=TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest15_ok.properties.in b/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest15_ok.properties.in
new file mode 100644
index 00000000000..37aca8ad55d
--- /dev/null
+++ b/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest15_ok.properties.in
@@ -0,0 +1,6 @@
+com.sun.management.jmxremote.ssl.enabled.cipher.suites=TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
+com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1
+com.sun.management.jmxremote.ssl.need.client.auth=true
+com.sun.management.jmxremote.ssl.config.file=@TEST-SRC@/jmxremote_ssltest11_ok.ssl
+com.sun.management.jmxremote.authenticate=false
+javax.rmi.ssl.client.enabledCipherSuites=TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt b/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt
index 48b5478ab32..133b3db62c8 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt
+++ b/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt
@@ -1,11 +1,10 @@
 The trustore and keystore are to be generated as follows:
 
-1. keytool -genkey -alias duke -keystore keystore -validity 36500
+1. keytool -genkey -alias duke -keyalg RSA -keysize 2048 -validity 36500 -keystore keystore -storepass password
 - use password 'password' for the keystore and key passwords
 - leave all values at default
 - the certificate validity will be 100 years (should be enough for now)
 2. keytool -export -keystore keystore -alias duke -file duke.crt
-3. keytool -import -keystore truststore -alias duke -file duke.crt
+3. keytool -import -alias duke -file duke.crt -keystore truststore -storepass trustword
 - use password 'trustword' for the keystore and key passwords
 - leave all values at default
-
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/ssl/keystore b/jdk/test/sun/management/jmxremote/bootstrap/ssl/keystore
index f756c3b0ef1..807a2f0df02 100644
Binary files a/jdk/test/sun/management/jmxremote/bootstrap/ssl/keystore and b/jdk/test/sun/management/jmxremote/bootstrap/ssl/keystore differ
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore b/jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore
index 3918d41f593..7c131cfd7ff 100644
Binary files a/jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore and b/jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore differ