--- old/test/java/rmi/reliability/juicer/AppleUserImpl.java	2012-07-03 11:31:51.803004474 -0700
+++ new/test/java/rmi/reliability/juicer/AppleUserImpl.java	2012-07-03 11:31:51.599001226 -0700
@@ -59,6 +59,7 @@
  * @build Apple AppleEvent AppleImpl AppleUserImpl
  * @build Orange OrangeEcho OrangeEchoImpl OrangeImpl
  * @build ApplicationServer
+ * @build TestLibrary
  *
  * @run main/othervm/policy=security.policy AppleUserImpl -seconds 30
  *
@@ -69,6 +70,7 @@
 import java.rmi.NoSuchObjectException;
 import java.rmi.server.UnicastRemoteObject;
 import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
 import java.util.Random;
 import java.util.logging.Logger;
 import java.util.logging.Level;
@@ -80,7 +82,7 @@
  * AppleUserThread is created for each apple.
  */
 public class AppleUserImpl extends UnicastRemoteObject implements AppleUser {
-
+    static int REGISTRY_PORT = -1;
     private static final Logger logger =
         Logger.getLogger("reliability.appleuser");
     private static int threadNum = 0;
@@ -308,8 +310,10 @@
 
             synchronized (user) {
                 // create new registry and bind new AppleUserImpl in registry
-                LocateRegistry.createRegistry(2006);
-                LocateRegistry.getRegistry(2006).rebind("AppleUser",user);
+                Registry registry = TestLibrary.createRegistryOnUnusedPort();
+                REGISTRY_PORT = TestLibrary.getRegistryPort(registry);
+                LocateRegistry.getRegistry(REGISTRY_PORT).rebind("AppleUser",
+                                                                 user);
 
                 // start the other server if applicable
                 if (othervm) {