--- old/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java	2012-07-03 11:31:53.151025934 -0700
+++ new/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java	2012-07-03 11:31:52.955022814 -0700
@@ -128,8 +128,9 @@
             ActivationGroup.createGroup(groupID, groupDesc, 0);
 
             EchoImpl impl = new EchoImpl(protocol);
-            System.out.println("EchoServer: binding in registry");
-            Naming.rebind("//:" + UseCustomSocketFactory.REGISTRY_PORT +
+            int registryPort = new Integer(System.getProperty("rmi.registry.port"));
+            System.out.println("EchoServer: binding in registry on port:" + registryPort);
+            Naming.rebind("//:" + registryPort +
                           "/EchoServer", impl);
             System.out.println("EchoServer ready.");
         } catch (Exception e) {