diff --git a/testData/dependencies/cycle/noCycle/com/a/A.java b/java/java-tests/testData/dependencies/cycle/noCycle/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/noCycle/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/noCycle/com/a/A.java
diff --git a/testData/dependencies/cycle/noCycle/com/b/B.java b/java/java-tests/testData/dependencies/cycle/noCycle/com/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/noCycle/com/b/B.java
rename to java/java-tests/testData/dependencies/cycle/noCycle/com/b/B.java
diff --git a/testData/dependencies/cycle/packageScope1/com/a/A.java b/java/java-tests/testData/dependencies/cycle/packageScope1/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/packageScope1/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/packageScope1/com/a/A.java
diff --git a/testData/dependencies/cycle/packageScope1/com/b/B.java b/java/java-tests/testData/dependencies/cycle/packageScope1/com/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/packageScope1/com/b/B.java
rename to java/java-tests/testData/dependencies/cycle/packageScope1/com/b/B.java
diff --git a/testData/dependencies/cycle/packageScope2/com/subscope1/a/A.java b/java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope1/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/packageScope2/com/subscope1/a/A.java
rename to java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope1/a/A.java
diff --git a/testData/dependencies/cycle/packageScope2/com/subscope1/b/B.java b/java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope1/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/packageScope2/com/subscope1/b/B.java
rename to java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope1/b/B.java
diff --git a/testData/dependencies/cycle/packageScope2/com/subscope2/c/C.java b/java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope2/c/C.java
similarity index 100%
rename from testData/dependencies/cycle/packageScope2/com/subscope2/c/C.java
rename to java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope2/c/C.java
diff --git a/testData/dependencies/cycle/packageScope2/com/subscope2/d/D.java b/java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope2/d/D.java
similarity index 100%
rename from testData/dependencies/cycle/packageScope2/com/subscope2/d/D.java
rename to java/java-tests/testData/dependencies/cycle/packageScope2/com/subscope2/d/D.java
diff --git a/testData/dependencies/cycle/t1/com/a/A.java b/java/java-tests/testData/dependencies/cycle/t1/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/t1/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/t1/com/a/A.java
diff --git a/testData/dependencies/cycle/t1/com/b/B.java b/java/java-tests/testData/dependencies/cycle/t1/com/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/t1/com/b/B.java
rename to java/java-tests/testData/dependencies/cycle/t1/com/b/B.java
diff --git a/testData/dependencies/cycle/t2/com/a/A.java b/java/java-tests/testData/dependencies/cycle/t2/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/t2/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/t2/com/a/A.java
diff --git a/testData/dependencies/cycle/t2/com/b/B.java b/java/java-tests/testData/dependencies/cycle/t2/com/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/t2/com/b/B.java
rename to java/java-tests/testData/dependencies/cycle/t2/com/b/B.java
diff --git a/testData/dependencies/cycle/t2/com/c/C.java b/java/java-tests/testData/dependencies/cycle/t2/com/c/C.java
similarity index 100%
rename from testData/dependencies/cycle/t2/com/c/C.java
rename to java/java-tests/testData/dependencies/cycle/t2/com/c/C.java
diff --git a/testData/dependencies/cycle/t2/com/d/D.java b/java/java-tests/testData/dependencies/cycle/t2/com/d/D.java
similarity index 100%
rename from testData/dependencies/cycle/t2/com/d/D.java
rename to java/java-tests/testData/dependencies/cycle/t2/com/d/D.java
diff --git a/testData/dependencies/cycle/t3/com/a/A.java b/java/java-tests/testData/dependencies/cycle/t3/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/t3/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/t3/com/a/A.java
diff --git a/testData/dependencies/cycle/t3/com/b/B.java b/java/java-tests/testData/dependencies/cycle/t3/com/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/t3/com/b/B.java
rename to java/java-tests/testData/dependencies/cycle/t3/com/b/B.java
diff --git a/testData/dependencies/cycle/t3/com/c/C.java b/java/java-tests/testData/dependencies/cycle/t3/com/c/C.java
similarity index 100%
rename from testData/dependencies/cycle/t3/com/c/C.java
rename to java/java-tests/testData/dependencies/cycle/t3/com/c/C.java
diff --git a/testData/dependencies/cycle/t3/com/d/D.java b/java/java-tests/testData/dependencies/cycle/t3/com/d/D.java
similarity index 100%
rename from testData/dependencies/cycle/t3/com/d/D.java
rename to java/java-tests/testData/dependencies/cycle/t3/com/d/D.java
diff --git a/testData/dependencies/cycle/t4/com/a/A.java b/java/java-tests/testData/dependencies/cycle/t4/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/t4/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/t4/com/a/A.java
diff --git a/testData/dependencies/cycle/t4/com/b/B.java b/java/java-tests/testData/dependencies/cycle/t4/com/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/t4/com/b/B.java
rename to java/java-tests/testData/dependencies/cycle/t4/com/b/B.java
diff --git a/testData/dependencies/cycle/t4/com/c/C.java b/java/java-tests/testData/dependencies/cycle/t4/com/c/C.java
similarity index 100%
rename from testData/dependencies/cycle/t4/com/c/C.java
rename to java/java-tests/testData/dependencies/cycle/t4/com/c/C.java
diff --git a/testData/dependencies/cycle/t4/com/d/D.java b/java/java-tests/testData/dependencies/cycle/t4/com/d/D.java
similarity index 100%
rename from testData/dependencies/cycle/t4/com/d/D.java
rename to java/java-tests/testData/dependencies/cycle/t4/com/d/D.java
diff --git a/testData/dependencies/cycle/t5/com/a/A.java b/java/java-tests/testData/dependencies/cycle/t5/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/t5/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/t5/com/a/A.java
diff --git a/testData/dependencies/cycle/t5/com/b/B.java b/java/java-tests/testData/dependencies/cycle/t5/com/b/B.java
similarity index 100%
rename from testData/dependencies/cycle/t5/com/b/B.java
rename to java/java-tests/testData/dependencies/cycle/t5/com/b/B.java
diff --git a/testData/dependencies/cycle/t5/com/c/C.java b/java/java-tests/testData/dependencies/cycle/t5/com/c/C.java
similarity index 100%
rename from testData/dependencies/cycle/t5/com/c/C.java
rename to java/java-tests/testData/dependencies/cycle/t5/com/c/C.java
diff --git a/testData/dependencies/cycle/t5/com/d/D.java b/java/java-tests/testData/dependencies/cycle/t5/com/d/D.java
similarity index 100%
rename from testData/dependencies/cycle/t5/com/d/D.java
rename to java/java-tests/testData/dependencies/cycle/t5/com/d/D.java
diff --git a/testData/dependencies/cycle/t6/com/a/A.java b/java/java-tests/testData/dependencies/cycle/t6/com/a/A.java
similarity index 100%
rename from testData/dependencies/cycle/t6/com/a/A.java
rename to java/java-tests/testData/dependencies/cycle/t6/com/a/A.java
diff --git a/testData/dependencies/cycle/t6/com/b/B1.java b/java/java-tests/testData/dependencies/cycle/t6/com/b/B1.java
similarity index 100%
rename from testData/dependencies/cycle/t6/com/b/B1.java
rename to java/java-tests/testData/dependencies/cycle/t6/com/b/B1.java
diff --git a/testData/dependencies/cycle/t6/com/b/B2.java b/java/java-tests/testData/dependencies/cycle/t6/com/b/B2.java
similarity index 100%
rename from testData/dependencies/cycle/t6/com/b/B2.java
rename to java/java-tests/testData/dependencies/cycle/t6/com/b/B2.java
diff --git a/testData/dependencies/cycle/t6/com/c/C.java b/java/java-tests/testData/dependencies/cycle/t6/com/c/C.java
similarity index 100%
rename from testData/dependencies/cycle/t6/com/c/C.java
rename to java/java-tests/testData/dependencies/cycle/t6/com/c/C.java
diff --git a/idea-tests/src/com/intellij/dependencies/CyclicDependenciesTest.java b/java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java
similarity index 89%
rename from idea-tests/src/com/intellij/dependencies/CyclicDependenciesTest.java
rename to java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java
index c21af8201238..17b27fabe46a 100644
--- a/idea-tests/src/com/intellij/dependencies/CyclicDependenciesTest.java
+++ b/java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java
@@ -1,10 +1,10 @@
 package com.intellij.dependencies;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.analysis.AnalysisScope;
 import com.intellij.analysis.JavaAnalysisScope;
 import com.intellij.cyclicDependencies.CyclicDependenciesBuilder;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiPackage;
@@ -24,7 +24,7 @@ public class CyclicDependenciesTest extends PsiTestCase {
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       public void run() {
         try {
-          String root = PathManagerEx.getTestDataPath() + "/dependencies/cycle/" + getTestName(true);
+          String root = JavaTestUtil.getJavaTestDataPath() + "/dependencies/cycle/" + getTestName(true);
           PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4"));
           PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete);
         }
@@ -162,11 +162,10 @@ public class CyclicDependenciesTest extends PsiTestCase {
     checkResult(expected, cyclicDependencies, true);
   }
 
-  private void checkResult(HashMap<String, String[][]> expected, HashMap<PsiPackage, Set<List<PsiPackage>>> cycles) {
+  private static void checkResult(HashMap<String, String[][]> expected, HashMap<PsiPackage, Set<List<PsiPackage>>> cycles) {
     assertEquals(expected.size(), cycles.size());
     Iterator<PsiPackage> it = cycles.keySet().iterator();
-    for (Iterator<String> iterator = expected.keySet().iterator(); iterator.hasNext();) {
-      final String packs = iterator.next();
+    for (final String packs : expected.keySet()) {
       final PsiPackage psiPackage = it.next();
       assertEquals(packs, psiPackage.getQualifiedName());
       assertEquals(expected.get(packs).length, cycles.get(psiPackage).size());
@@ -176,8 +175,7 @@ public class CyclicDependenciesTest extends PsiTestCase {
         final List<PsiPackage> cycle = iC.next();
         assertEquals(expectedCycle.length, cycle.size());
         Iterator<PsiPackage> iCycle = cycle.iterator();
-        for (int j = 0; j < expectedCycle.length; j++) {
-          final String expectedInCycle = expectedCycle[j];
+        for (final String expectedInCycle : expectedCycle) {
           final PsiPackage packageInCycle = iCycle.next();
           assertEquals(expectedInCycle, packageInCycle.getQualifiedName());
         }
@@ -185,22 +183,19 @@ public class CyclicDependenciesTest extends PsiTestCase {
     }
   }
 
-  private void checkResult(HashMap<String, String[][]> expected, HashMap<PsiPackage, Set<List<PsiPackage>>> cycles, boolean forceContains){
+  private static void checkResult(HashMap<String, String[][]> expected, HashMap<PsiPackage, Set<List<PsiPackage>>> cycles, boolean forceContains){
     assertEquals(expected.size(), cycles.size());
-    for (Iterator<PsiPackage> iterator = cycles.keySet().iterator(); iterator.hasNext();) {
-      final PsiPackage psiPackage = iterator.next();
+    for (final PsiPackage psiPackage : cycles.keySet()) {
       assertTrue(expected.containsKey(psiPackage.getQualifiedName()));
       final String packs = psiPackage.getQualifiedName();
-      if (forceContains){
+      if (forceContains) {
         assertEquals(expected.get(packs).length, cycles.get(psiPackage).size());
       }
-      for (Iterator<List<PsiPackage>> iC = cycles.get(psiPackage).iterator(); iC.hasNext();) {
-        final List<PsiPackage> cycle = iC.next();
+      for (final List<PsiPackage> cycle : cycles.get(psiPackage)) {
         final String[][] expectedCycles = expected.get(packs);
-        final String [] string = new String[cycle.size()];
+        final String[] string = new String[cycle.size()];
         int i = 0;
-        for (Iterator<PsiPackage> iCycle = cycle.iterator(); iCycle.hasNext();) {
-          final PsiPackage packageInCycle = iCycle.next();
+        for (final PsiPackage packageInCycle : cycle) {
           string[i++] = packageInCycle.getQualifiedName();
         }
         assertTrue(findInMatrix(expectedCycles, string) > -1);