diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
index e88c5caf015a..944fa7a0abe4 100644
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
@@ -252,15 +252,24 @@ public class JavaSdkImpl extends JavaSdk {
   }
 
   public static Sdk getMockJdk(@NonNls String versionName) {
+    File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK");
+    if (mockJdkCEPath.exists()) {
+      return createMockJdk(mockJdkCEPath.getPath(), versionName, getInstance());
+    }
     final String forcedPath = System.getProperty("idea.testingFramework.mockJDK");
     String jdkHome = forcedPath != null ? forcedPath : PathManager.getHomePath() + File.separator + "mockJDK";
     return createMockJdk(jdkHome, versionName, getInstance());
   }
 
   public static Sdk getMockJdk15(@NonNls String versionName) {
+    File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK");
+    if (mockJdkCEPath.exists()) {
+      return createMockJdk(mockJdkCEPath.getPath(), versionName, getInstance());
+    }
     String jdkHome = PathManager.getHomePath() + File.separator + "mockJDK-1.5";
     return createMockJdk(jdkHome, versionName, getInstance());
   }
+  
   public static Sdk getMockJdk17(@NonNls String versionName) {
     String jdkHome = PathManager.getHomePath() + File.separator + "mockJDK-1.7";
     return createMockJdk(jdkHome, versionName, getInstance());
diff --git a/mockJDK-1.5/jre/lib/annotations.jar b/java/mockJDK/jre/lib/annotations.jar
similarity index 100%
rename from mockJDK-1.5/jre/lib/annotations.jar
rename to java/mockJDK/jre/lib/annotations.jar
diff --git a/mockJDK-1.5/jre/lib/rt.jar b/java/mockJDK/jre/lib/rt.jar
similarity index 100%
rename from mockJDK-1.5/jre/lib/rt.jar
rename to java/mockJDK/jre/lib/rt.jar
diff --git a/mockJDK-1.5/src.zip b/java/mockJDK/src.zip
similarity index 100%
rename from mockJDK-1.5/src.zip
rename to java/mockJDK/src.zip
diff --git a/plugins/spellchecker/testData/inspection/docCommentWithMistakes/SPITest6.java b/plugins/spellchecker/testData/inspection/docCommentWithMistakes/SPITest6.java
index 4467782c32ba..964de24f9e1f 100644
--- a/plugins/spellchecker/testData/inspection/docCommentWithMistakes/SPITest6.java
+++ b/plugins/spellchecker/testData/inspection/docCommentWithMistakes/SPITest6.java
@@ -3,7 +3,6 @@ package testData.inspection.docCommentWithMistakes.data.java.src;
 /**
  * doc <TYPO descr="Word 'commment' is misspelled">commment</TYPO>
  *
- * @author Ekaterina Shliakhovetskaja
  * @author Test Test
  */
 class SPITest6 {