diff --git a/plugins/IntelliLang/IntelliLang-xml.iml b/plugins/IntelliLang/IntelliLang-xml.iml
index 62d3a331f7ee..608a5e9f2e97 100644
--- a/plugins/IntelliLang/IntelliLang-xml.iml
+++ b/plugins/IntelliLang/IntelliLang-xml.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="xml" />
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestBase.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestBase.java
index b34866ed68ac..f3bb4fbd033d 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestBase.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestBase.java
@@ -16,10 +16,10 @@
 package org.intellij.lang.xpath;
 
 import com.intellij.openapi.application.PluginPathManager;
-import com.intellij.testFramework.IdeaTestCase;
+import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
 import com.intellij.testFramework.fixtures.IdeaProjectTestFixture;
-import com.intellij.testFramework.fixtures.JavaTestFixtureFactory;
+import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import junit.framework.TestCase;
 
 /*
@@ -30,14 +30,14 @@ import junit.framework.TestCase;
 public abstract class TestBase extends TestCase {
 
   protected TestBase() {
-    IdeaTestCase.initPlatformPrefix();
+    PlatformTestCase.initPlatformLangPrefix();
   }
 
   protected CodeInsightTestFixture myFixture;
 
     @Override
     protected void setUp() throws Exception {
-        final JavaTestFixtureFactory factory = JavaTestFixtureFactory.getFixtureFactory();
+        final IdeaTestFixtureFactory factory = IdeaTestFixtureFactory.getFixtureFactory();
         final IdeaProjectTestFixture fixture = factory.createLightFixtureBuilder().getFixture();
         myFixture = factory.createCodeInsightFixture(fixture);
 
diff --git a/plugins/xpath/xpath.iml b/plugins/xpath/xpath.iml
index 84962b9d939b..1f3675b6e673 100644
--- a/plugins/xpath/xpath.iml
+++ b/plugins/xpath/xpath.iml
@@ -12,21 +12,17 @@
     <orderEntry type="module" module-name="xml-openapi" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="dom-openapi" />
-    <orderEntry type="module" module-name="debugger-impl" />
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="library" name="commons-collections" level="project" />
     <orderEntry type="module" module-name="xslt-rt" />
     <orderEntry type="module" module-name="lvcs-impl" />
-    <orderEntry type="module" module-name="jam-support-impl" />
-    <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="annotations" />
     <orderEntry type="library" name="Jaxen" level="project" />
     <orderEntry type="module" module-name="resources-en" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="dom-impl" scope="RUNTIME" />
   </component>
 </module>