--- a/jdk/test/ProblemList.txt	Mon Jun 29 15:04:43 2015 +0800
+++ b/jdk/test/ProblemList.txt	Mon Jun 29 17:11:17 2015 +0800
@@ -221,9 +221,6 @@
 # 7164518: no PortUnreachableException on Mac
 sun/security/krb5/auto/Unreachable.java                         macosx-all
 
-# 8058849
-sun/security/krb5/config/dns.sh                                 generic-all
-
 # 7041639: Solaris DSA keypair generation bug
 java/security/KeyPairGenerator/SolarisShortDSA.java             solaris-all
 sun/security/tools/keytool/standard.sh                          solaris-all

--- a/jdk/test/sun/security/krb5/config/NamingManager.java	Mon Jun 29 15:04:43 2015 +0800
+++ b/jdk/test/sun/security/krb5/config/NamingManager.java	Mon Jun 29 17:11:17 2015 +0800
@@ -23,7 +23,6 @@
 
 package javax.naming.spi;
 
-import com.sun.jndi.dns.DnsContext;
 import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.NamingException;
@@ -31,6 +30,7 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.InitialDirContext;
 
 /**
  * A fake javax.naming.spi.NamingManager. It allows reading a DNS
@@ -43,7 +43,7 @@
     public static Context getURLContext(
             String scheme, Hashtable<?,?> environment)
             throws NamingException {
-        return new DnsContext("", null, new Hashtable<String,String>()) {
+        return new InitialDirContext() {
             public Attributes getAttributes(String name, String[] attrIds)
                     throws NamingException {
                 return new BasicAttributes() {