--- a/langtools/test/tools/javadoc/6964914/TestUserDoclet.java	Tue Nov 18 15:25:18 2014 -0800
+++ b/langtools/test/tools/javadoc/6964914/TestUserDoclet.java	Wed Dec 03 14:25:46 2014 +0000
@@ -47,8 +47,6 @@
     /** Main test method. */
     void run() throws Exception {
         File javaHome = new File(System.getProperty("java.home"));
-        if (javaHome.getName().equals("jre"))
-            javaHome = javaHome.getParentFile();
         File javadoc = new File(new File(javaHome, "bin"), "javadoc");
         File testSrc = new File(System.getProperty("test.src"));
         File testClasses = new File(System.getProperty("test.classes"));