diff --git a/platform/platform-impl/testData/pluginDescriptor/asp.jar b/java/java-tests/testData/ide/plugins/pluginDescriptor/asp.jar
similarity index 100%
rename from platform/platform-impl/testData/pluginDescriptor/asp.jar
rename to java/java-tests/testData/ide/plugins/pluginDescriptor/asp.jar
diff --git a/platform/platform-impl/testData/pluginDescriptor/resources_en.jar b/java/java-tests/testData/ide/plugins/pluginDescriptor/resources_en.jar
similarity index 100%
rename from platform/platform-impl/testData/pluginDescriptor/resources_en.jar
rename to java/java-tests/testData/ide/plugins/pluginDescriptor/resources_en.jar
diff --git a/platform/util/testData/reorderJars/annotations.jar b/java/java-tests/testData/ide/plugins/reorderJars/annotations.jar
similarity index 100%
rename from platform/util/testData/reorderJars/annotations.jar
rename to java/java-tests/testData/ide/plugins/reorderJars/annotations.jar
diff --git a/platform/util/testData/reorderJars/order.txt b/java/java-tests/testData/ide/plugins/reorderJars/order.txt
similarity index 100%
rename from platform/util/testData/reorderJars/order.txt
rename to java/java-tests/testData/ide/plugins/reorderJars/order.txt
diff --git a/platform/util/testData/reorderJars/zkm.jar b/java/java-tests/testData/ide/plugins/reorderJars/zkm.jar
similarity index 100%
rename from platform/util/testData/reorderJars/zkm.jar
rename to java/java-tests/testData/ide/plugins/reorderJars/zkm.jar
diff --git a/platform/util/testData/reorderJars/zkmOrder.txt b/java/java-tests/testData/ide/plugins/reorderJars/zkmOrder.txt
similarity index 100%
rename from platform/util/testData/reorderJars/zkmOrder.txt
rename to java/java-tests/testData/ide/plugins/reorderJars/zkmOrder.txt
diff --git a/platform/platform-impl/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java b/platform/platform-impl/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java
index 660eceb3f605..fd4a052a8933 100644
--- a/platform/platform-impl/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java
+++ b/platform/platform-impl/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java
@@ -1,6 +1,6 @@
 package com.intellij.ide.plugins;
 
-import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.ex.PathManagerEx;
 import junit.framework.TestCase;
 
 import java.io.File;
@@ -12,8 +12,10 @@ import java.io.File;
 public class PluginDescriptorTest extends TestCase {
 
   public void testDescriptorLoading() throws Exception {
-    String path = PathManager.getHomePath().replace(File.separatorChar, '/') + "/community/platform/platform-impl/testData/pluginDescriptor";
-    IdeaPluginDescriptorImpl descriptor = PluginManager.loadDescriptorFromJar(new File(path + "/asp.jar"));
+    String path = PathManagerEx.getTestDataPath().replace(File.separatorChar, '/') + "/ide/plugins/pluginDescriptor";
+    File file = new File(path + "/asp.jar");
+    assertTrue(file + " not exist", file.exists());
+    IdeaPluginDescriptorImpl descriptor = PluginManager.loadDescriptorFromJar(file);
     assertNotNull(descriptor);
   }
 }
diff --git a/platform/util/testSrc/com/intellij/util/io/zip/ReorderJarsTest.java b/platform/util/testSrc/com/intellij/util/io/zip/ReorderJarsTest.java
index 8f74ac52c9db..bcd833dddd77 100644
--- a/platform/util/testSrc/com/intellij/util/io/zip/ReorderJarsTest.java
+++ b/platform/util/testSrc/com/intellij/util/io/zip/ReorderJarsTest.java
@@ -1,6 +1,6 @@
 package com.intellij.util.io.zip;
 
-import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.lang.JarMemoryLoader;
 import junit.framework.TestCase;
@@ -21,7 +21,7 @@ public class ReorderJarsTest extends TestCase {
 
   public void testReordering() throws IOException {
 
-    String path = PathManager.getHomePath().replace(File.separatorChar, '/') + "/community/platform/util/testData/reorderJars";
+    String path = PathManagerEx.getTestDataPath().replace(File.separatorChar, '/') + "/ide/plugins/reorderJars";
     JBZipFile zipFile = null;
     try {
       zipFile = new JBZipFile(path + "/annotations.jar");
@@ -70,7 +70,7 @@ public class ReorderJarsTest extends TestCase {
   }
 
   public void testPluginXml() throws Exception {
-    String path = PathManager.getHomePath().replace(File.separatorChar, '/') + "/community/platform/util/testData/reorderJars";
+    String path = PathManagerEx.getTestDataPath().replace(File.separatorChar, '/') + "/ide/plugins/reorderJars";
 
     ReorderJarsMain.main(new String[] { path + "/zkmOrder.txt", path, myTempDirectory.getPath() } );
     File[] files = myTempDirectory.listFiles();
diff --git a/platform/util/util.iml b/platform/util/util.iml
index 2ccdc5f15106..2b519753f1a6 100644
--- a/platform/util/util.iml
+++ b/platform/util/util.iml
@@ -18,6 +18,7 @@
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" name="OroMatcher" level="project" />
+    <orderEntry type="module" module-name="testFramework" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>