diff --git a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in b/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in
index 036d3f3c19e..21fa833234c 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in
+++ b/jdk/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in
@@ -1,5 +1,5 @@
-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.cipher.suites=TLS_DHE_DSS_WITH_AES_128_GCM_SHA256
 com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1
 com.sun.management.jmxremote.ssl.need.client.auth=true
 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_DHE_DSS_WITH_AES_128_GCM_SHA256
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt b/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt
new file mode 100644
index 00000000000..48b5478ab32
--- /dev/null
+++ b/jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt
@@ -0,0 +1,11 @@
+The trustore and keystore are to be generated as follows:
+
+1. keytool -genkey -alias duke -keystore keystore -validity 36500
+- 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
+- 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 05f53564582..f756c3b0ef1 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 2f5ba3433dc..3918d41f593 100644
Binary files a/jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore and b/jdk/test/sun/management/jmxremote/bootstrap/ssl/truststore differ