--- old/test/java/rmi/Naming/RmiIsNoScheme.java	2012-04-20 14:46:02.576805619 -0700
+++ new/test/java/rmi/Naming/RmiIsNoScheme.java	2012-04-20 14:46:02.208807648 -0700
@@ -40,7 +40,7 @@
 
 public class RmiIsNoScheme implements Remote, Serializable {
 
-    private static final int REGISTRY_PORT = 2002;
+//    private static final int REGISTRY_PORT = TestLibrary.getUnusedRandomPort();
 
     private RmiIsNoScheme() {}
 
@@ -49,10 +49,11 @@
         System.err.println("\nRegression test for bug 4626311\n");
 
         try {
-            LocateRegistry.createRegistry(REGISTRY_PORT);
-            Naming.rebind("//:" + REGISTRY_PORT + "/RmiIsNoScheme",
+            Registry registry = TestLibrary.createRegistryOnUnusedPort();
+            int registryPort = TestLibrary.getRegistryPort(registry);
+            Naming.rebind("//:" + registryPort + "/RmiIsNoScheme",
                           new RmiIsNoScheme());
-            String name = Naming.list("//:" + REGISTRY_PORT)[0];
+            String name = Naming.list("//:" + registryPort)[0];
             System.err.println("name = " + name);
             if (name.startsWith("rmi:", 0) == false) {
                 System.err.println("TEST PASSED: rmi scheme not present");