diff --git a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java
index 3dd72481495..edd15ae2338 100644
--- a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java
+++ b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java
@@ -30,8 +30,7 @@
  * @run main ContextWithNullProperties
  */
 
-import com.sun.jndi.rmi.registry.RegistryContextsun.jndi.rmi.RegistryContext;
-import java.rmi.RemoteException;
+import com.sun.jndi.rmi.registry.RegistryContext;
 import java.rmi.registry.Registry;
 
 public class ContextWithNullProperties {
diff --git a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java
index 9ff1d0162a2..692c7fd5cab 100644
--- a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java
+++ b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java
@@ -32,6 +32,7 @@
  */
 
 import java.rmi.registry.Registry;
+import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;