diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCompletionTestWithLibrary.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCompletionTestWithLibrary.groovy
index 2297b11c51b9..5bffbbdfa5c9 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCompletionTestWithLibrary.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCompletionTestWithLibrary.groovy
@@ -47,16 +47,26 @@ class GrCompletionTestWithLibrary extends GroovyCompletionTestBase {
     return GROOVY_17_PROJECT_DESCRIPTOR;
   }
 
-
   @Override
   protected String getBasePath() {
-    return TestUtils.getTestDataPath() + "groovy/completionWithLibrary/";
+    return TestUtils.getTestDataPath() + "groovy/completion/";
   }
 
-
   public void testCategoryMethod() {doBasicTest()}
   public void testCategoryProperty() {doBasicTest()}
   public void testMultipleCategories() {doBasicTest()}
 
   public void testArrayLikeAccessForList() throws Throwable {doBasicTest(); }
+  public void testArrayLikeAccessForMap() throws Throwable {doBasicTest();}
+
+  public void testEachMethodForList() throws Throwable {doBasicTest();}
+  public void testEachMethodForMapWithKeyValue() throws Throwable {doBasicTest();}
+  public void testEachMethodForMapWithEntry() throws Throwable {doBasicTest();}
+  public void testWithMethod() throws Throwable {doBasicTest();}
+  public void testInjectMethodForCollection() throws Throwable {doBasicTest();}
+  public void testInjectMethodForArray() throws Throwable {doBasicTest();}
+  public void testInjectMethodForMap() throws Throwable {doBasicTest();}
+  public void testClosureDefaultParameterInEachMethod() throws Throwable {doBasicTest();}
+  public void testEachMethodForRanges() throws Throwable {doBasicTest();}
+  public void testEachMethodForEnumRanges() throws Throwable {doBasicTest();}
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.java
index db2e370bec05..bde311d89c66 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.java
@@ -64,50 +64,6 @@ public class GroovyCompletionTest extends GroovyCompletionTestBase {
     doSmartTest();
   }
 
-  public void testEachMethodForList() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testEachMethodForMapWithKeyValue() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testEachMethodForMapWithEntry() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testWithMethod() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testInjectMethodForCollection() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testInjectMethodForArray() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testInjectMethodForMap() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testClosureDefaultParameterInEachMethod() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testArrayLikeAccessForMap() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testEachMethodForRanges() throws Throwable {
-    doBasicTest();
-  }
-
-  public void testEachMethodForEnumRanges() throws Throwable {
-    doBasicTest();
-  }
-
   public void testNamedParametersForApplication() throws Throwable {
     doVariantableTest("abx", "aby");
   }
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/ArrayLikeAccessForList.groovy b/plugins/groovy/testdata/groovy/completion/ArrayLikeAccessForList.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/ArrayLikeAccessForList.groovy
rename to plugins/groovy/testdata/groovy/completion/ArrayLikeAccessForList.groovy
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/ArrayLikeAccessForList_after.groovy b/plugins/groovy/testdata/groovy/completion/ArrayLikeAccessForList_after.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/ArrayLikeAccessForList_after.groovy
rename to plugins/groovy/testdata/groovy/completion/ArrayLikeAccessForList_after.groovy
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/CategoryMethod.groovy b/plugins/groovy/testdata/groovy/completion/CategoryMethod.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/CategoryMethod.groovy
rename to plugins/groovy/testdata/groovy/completion/CategoryMethod.groovy
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/CategoryMethod_after.groovy b/plugins/groovy/testdata/groovy/completion/CategoryMethod_after.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/CategoryMethod_after.groovy
rename to plugins/groovy/testdata/groovy/completion/CategoryMethod_after.groovy
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/CategoryProperty.groovy b/plugins/groovy/testdata/groovy/completion/CategoryProperty.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/CategoryProperty.groovy
rename to plugins/groovy/testdata/groovy/completion/CategoryProperty.groovy
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/CategoryProperty_after.groovy b/plugins/groovy/testdata/groovy/completion/CategoryProperty_after.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/CategoryProperty_after.groovy
rename to plugins/groovy/testdata/groovy/completion/CategoryProperty_after.groovy
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/MultipleCategories.groovy b/plugins/groovy/testdata/groovy/completion/MultipleCategories.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/MultipleCategories.groovy
rename to plugins/groovy/testdata/groovy/completion/MultipleCategories.groovy
diff --git a/plugins/groovy/testdata/groovy/completionWithLibrary/MultipleCategories_after.groovy b/plugins/groovy/testdata/groovy/completion/MultipleCategories_after.groovy
similarity index 100%
rename from plugins/groovy/testdata/groovy/completionWithLibrary/MultipleCategories_after.groovy
rename to plugins/groovy/testdata/groovy/completion/MultipleCategories_after.groovy