diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0e7013fe25da..8ac9e74a84ef 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -19,6 +19,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/ant/ant.iml" filepath="$PROJECT_DIR$/plugins/ant/ant.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/jps/antLayout/antlayout.iml" filepath="$PROJECT_DIR$/jps/antLayout/antlayout.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/bindSvn/bindSvn.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/bindSvn/bindSvn.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" />
@@ -57,6 +58,8 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/git4idea.iml" filepath="$PROJECT_DIR$/plugins/git4idea/git4idea.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/rt/git4idea-rt.iml" filepath="$PROJECT_DIR$/plugins/git4idea/rt/git4idea-rt.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github.iml" filepath="$PROJECT_DIR$/plugins/github/github.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/groovy/jps-plugin/groovy-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/groovy/jps-plugin/groovy-jps-plugin.iml" group="plugins/Groovy" />
       <module fileurl="file://$PROJECT_DIR$/plugins/groovy/rt-constants/groovy-rt-constants.iml" filepath="$PROJECT_DIR$/plugins/groovy/rt-constants/groovy-rt-constants.iml" group="plugins/Groovy" />
diff --git a/plugins/google-app-engine/GoogleAppEngine.iml b/plugins/google-app-engine/google-app-engine.iml
similarity index 100%
rename from plugins/google-app-engine/GoogleAppEngine.iml
rename to plugins/google-app-engine/google-app-engine.iml
diff --git a/plugins/google-app-engine/jps-plugin/testSource/org/jetbrains/jps/appengine/JpsAppEngineSerializationTest.java b/plugins/google-app-engine/jps-plugin/testSource/org/jetbrains/jps/appengine/JpsAppEngineSerializationTest.java
index 62a0347c17df..50c75f85349d 100644
--- a/plugins/google-app-engine/jps-plugin/testSource/org/jetbrains/jps/appengine/JpsAppEngineSerializationTest.java
+++ b/plugins/google-app-engine/jps-plugin/testSource/org/jetbrains/jps/appengine/JpsAppEngineSerializationTest.java
@@ -11,7 +11,7 @@ import org.jetbrains.jps.model.serialization.JpsSerializationTestCase;
  * @author nik
  */
 public class JpsAppEngineSerializationTest extends JpsSerializationTestCase {
-  public static final String PROJECT_PATH = "plugins/GoogleAppEngine/jps-plugin/testData/serialization/appEngine";
+  public static final String PROJECT_PATH = "plugins/google-app-engine/jps-plugin/testData/serialization/appEngine";
 
   public void testLoad() {
     loadProject(PROJECT_PATH + "/appEngine.ipr");
diff --git a/plugins/google-app-engine/testSource/META-INF/plugin.xml b/plugins/google-app-engine/testSource/META-INF/plugin.xml
new file mode 100644
index 000000000000..01deb890064a
--- /dev/null
+++ b/plugins/google-app-engine/testSource/META-INF/plugin.xml
@@ -0,0 +1,8 @@
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+  <name>Google App Engine Integration Test</name>
+  <id>com.intellij.appengine-test</id>
+  <description>
+      This fake plugin descriptor is used to run tests
+  </description>
+  <xi:include href="/META-INF/google-app-engine-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+</idea-plugin>
diff --git a/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java b/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java
index 21e6eeb9e752..a90b395b6e12 100644
--- a/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java
+++ b/plugins/google-app-engine/testSource/com/intellij/appengine/AppEngineCodeInsightTestCase.java
@@ -2,9 +2,9 @@ package com.intellij.appengine;
 
 import com.intellij.appengine.facet.AppEngineFacet;
 import com.intellij.facet.FacetManager;
-import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
 import com.intellij.openapi.util.io.FileUtil;
@@ -42,7 +42,7 @@ public abstract class AppEngineCodeInsightTestCase extends UsefulTestCase {
 
   protected abstract String getBaseDirectoryPath();
 
-  private static void addAppEngineSupport(Module module, String version) {
+  private void addAppEngineSupport(Module module, String version) {
     final AppEngineFacet appEngine = FacetManager.getInstance(module).addFacet(AppEngineFacet.getFacetType(), "AppEngine", null);
     final String sdkPath = FileUtil.toSystemIndependentName(getTestDataPath()) + "sdk/" + version;
     appEngine.getConfiguration().setSdkHomePath(sdkPath);
@@ -76,7 +76,7 @@ public abstract class AppEngineCodeInsightTestCase extends UsefulTestCase {
     return codeInsightFixture;
   }
 
-  private static String getTestDataPath() {
-    return PathManager.getHomePath() + FileUtil.toSystemDependentName("/plugins/GoogleAppEngine/testData/");
+  private String getTestDataPath() {
+    return PathManagerEx.getHomePath(getClass()) + FileUtil.toSystemDependentName("/plugins/google-app-engine/testData/");
   }
 }