--- a/jdk/src/share/classes/sun/management/Agent.java	Sat Oct 19 17:53:44 2013 +0100
+++ b/jdk/src/share/classes/sun/management/Agent.java	Sat Oct 19 20:59:42 2013 +0400
@@ -323,7 +323,7 @@
                     : String.format(
                     "service:jmx:rmi:///jndi/rmi://%s:%s/jmxrmi", hostname, jmxremotePort);
 
-            String instanceName = System.getProperty("com.sun.management.jdp.name");
+            String instanceName = props.getProperty("com.sun.management.jdp.name");
 
             try{
                JdpController.startDiscoveryService(address, port, instanceName, jmxUrlStr);

--- a/jdk/test/sun/management/jdp/JdpTest.sh	Sat Oct 19 17:53:44 2013 +0100
+++ b/jdk/test/sun/management/jdp/JdpTest.sh	Sat Oct 19 20:59:42 2013 +0400
@@ -213,6 +213,7 @@
                 jdp.port=${_port} \
                 jdp.address=${_ip} \
                 jdp.pause=5 \
+                jdp.name=jcmdtest \
                 jmxremote.port=${_jmxport} \
                 jmxremote.authenticate=false \
                 jmxremote.ssl=false

--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh	Sat Oct 19 17:53:44 2013 +0100
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh	Sat Oct 19 20:59:42 2013 +0400
@@ -551,6 +551,11 @@
  esac 
 done
 
+if [ "${COMPILEJAVA}" = "" ]
+then 
+  COMPILEJAVA=${TESTJAVA}
+fi
+
 if [ ${_compile} = "yes" ]
 then
  _compile