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 0530eb76420a..1c957a79cfaf 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
@@ -302,9 +302,13 @@ public class JavaSdkImpl extends JavaSdk {
     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());
+  public static Sdk getMockJdk17() {
+    File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK-1.7");
+    if (mockJdkCEPath.exists()) {
+      return createMockJdk(mockJdkCEPath.getPath(), "java 1.7", getInstance());
+    }
+    mockJdkCEPath = new File(PathManager.getHomePath(), "community/java/mockJDK-1.7");
+    return createMockJdk(mockJdkCEPath.getPath(), "java 1.7", getInstance());
   }
 
   private static Sdk createMockJdk(String jdkHome, final String versionName, JavaSdk javaSdk) {
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
index 7e6b61327d86..fc1b71efd772 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
@@ -226,6 +226,6 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
   }
   @Override
    protected Sdk getProjectJDK() {
-    return JavaSdkImpl.getMockJdk17("java 1.7");
+    return JavaSdkImpl.getMockJdk17();
   }
 }
diff --git a/java/mockJDK-1.7/jre/lib/annotations.jar b/java/mockJDK-1.7/jre/lib/annotations.jar
new file mode 100644
index 000000000000..5de67805f7b7
Binary files /dev/null and b/java/mockJDK-1.7/jre/lib/annotations.jar differ
diff --git a/java/mockJDK-1.7/jre/lib/rt.jar b/java/mockJDK-1.7/jre/lib/rt.jar
new file mode 100644
index 000000000000..fdbd1eb22b7a
Binary files /dev/null and b/java/mockJDK-1.7/jre/lib/rt.jar differ
diff --git a/java/mockJDK-1.7/lib/jsp-api.jar b/java/mockJDK-1.7/lib/jsp-api.jar
new file mode 100644
index 000000000000..95832ba0a217
Binary files /dev/null and b/java/mockJDK-1.7/lib/jsp-api.jar differ
diff --git a/java/mockJDK-1.7/lib/servlet-api.jar b/java/mockJDK-1.7/lib/servlet-api.jar
new file mode 100644
index 000000000000..bc0dea064501
Binary files /dev/null and b/java/mockJDK-1.7/lib/servlet-api.jar differ
diff --git a/java/mockJDK-1.7/src.zip b/java/mockJDK-1.7/src.zip
new file mode 100644
index 000000000000..4ac79dc0a0bd
Binary files /dev/null and b/java/mockJDK-1.7/src.zip differ