--- old/test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java	2012-04-20 14:46:58.541055361 -0700
+++ new/test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java	2012-04-20 14:46:58.168555665 -0700
@@ -33,8 +33,10 @@
 
     public static void main(String[] args) {
         try {
+            int registryPort =
+                new Integer(System.getProperty("rmi.registry.port"));
             Registry registry =
-                LocateRegistry.getRegistry("", TestLibrary.REGISTRY_PORT);
+                LocateRegistry.getRegistry("", registryPort);
             Remote stub = registry.lookup(LeaseCheckInterval.BINDING);
             Runtime.getRuntime().halt(0);
         } catch (Exception e) {