--- old/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java	2012-07-03 11:31:22.130532089 -0700
+++ new/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java	2012-07-03 11:31:21.930528905 -0700
@@ -25,26 +25,31 @@
  * @test
  * @bug 6676075
  * @summary RegistryContext (com.sun.jndi.url.rmi.rmiURLContext) coding problem
+ * @library ../../../../../../java/rmi/testlibrary
+ * @build TestLibrary
+ * @run main ContextWithNullProperties
  */
 
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 
 import com.sun.jndi.rmi.registry.*;
+import java.rmi.registry.Registry;
 
 public class ContextWithNullProperties {
-
     public static void main(String[] args) throws Exception {
+        int registryPort = -1;
 
-        // Create registry on port 1099 if one is not already running.
+        // Create registry if one is not already running.
         try {
-            LocateRegistry.createRegistry(1099);
+            Registry registry = TestLibrary.createRegistryOnUnusedPort();
+            registryPort = TestLibrary.getRegistryPort(registry);
         } catch (RemoteException e) {
         }
 
         System.out.println("Connecting to the default Registry...");
         // Connect to the default Registry.
         // Pass null as the JNDI environment properties (see final argument)
-        RegistryContext ctx = new RegistryContext(null, -1, null);
+        RegistryContext ctx = new RegistryContext(null, registryPort, null);
     }
 }