diff --git a/.idea/libraries/Groovy__.xml b/.idea/libraries/Groovy__.xml
new file mode 100644
index 000000000000..536437648576
--- /dev/null
+++ b/.idea/libraries/Groovy__.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Groovy++">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/community/lib/groovypp-all-0.4.170.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/community/lib/src/groovypp-0.4.170-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/lib/groovypp-all-0.4.170.jar b/lib/groovypp-all-0.4.170.jar
new file mode 100644
index 000000000000..881b34d58cf6
Binary files /dev/null and b/lib/groovypp-all-0.4.170.jar differ
diff --git a/lib/src/groovypp-0.4.170-sources.jar b/lib/src/groovypp-0.4.170-sources.jar
new file mode 100644
index 000000000000..4983d2694272
Binary files /dev/null and b/lib/src/groovypp-0.4.170-sources.jar differ
diff --git a/plugins/groovy/jetgroovy.iml b/plugins/groovy/jetgroovy.iml
index 7950afc27699..cb5c7093b258 100644
--- a/plugins/groovy/jetgroovy.iml
+++ b/plugins/groovy/jetgroovy.iml
@@ -30,6 +30,7 @@
     <orderEntry type="module" module-name="IntelliLang-java" scope="TEST" />
     <orderEntry type="module" module-name="IntelliLang-xml" scope="TEST" />
     <orderEntry type="module" module-name="jam-support-openapi" />
+    <orderEntry type="library" scope="PROVIDED" name="Groovy++" level="project" />
   </component>
 </module>
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.gpp
similarity index 91%
rename from plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.groovy
rename to plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.gpp
index 7d951d2ef99d..48f60b0976a4 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GppCompilerTest.gpp
@@ -18,8 +18,7 @@ package org.jetbrains.plugins.groovy.compiler;
 
 
 import com.intellij.openapi.vfs.VfsUtil
-import com.intellij.testFramework.PsiTestUtil
-import org.jetbrains.plugins.groovy.util.TestUtils
+import org.jetbrains.plugins.groovy.config.GroovyConfigUtils
 
 /**
  * @author peter
@@ -27,7 +26,8 @@ import org.jetbrains.plugins.groovy.util.TestUtils
 public class GppCompilerTest extends GroovyCompilerTestCase {
   @Override protected void setUp() {
     super.setUp();
-    PsiTestUtil.addLibrary myFixture.module, "gpp", TestUtils.absoluteTestDataPath + "/realGroovypp/", "groovypp-all-0.2.13.jar"
+    addGroovyLibrary myModule, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN, "groovy";
+    addGroovyLibrary myFixture.module, "groovypp-all-(.*)jar", "gpp"
   }
 
   public void testTraitStubs() throws Throwable {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.gpp
similarity index 98%
rename from plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
rename to plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.gpp
index 0ac2c58c78f1..5856ec4209ed 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.gpp
@@ -22,6 +22,7 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import junit.framework.AssertionFailedError
+import org.jetbrains.plugins.groovy.config.GroovyConfigUtils
 
 /**
  * @author peter
@@ -29,7 +30,7 @@ import junit.framework.AssertionFailedError
 public class GroovyCompilerTest extends GroovyCompilerTestCase {
   @Override protected void setUp() {
     super.setUp();
-    addGroovyLibrary(myModule);
+    addGroovyLibrary(myModule, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN, "groovy");
   }
 
   public void testPlainGroovy() throws Throwable {
@@ -266,7 +267,7 @@ public class GroovyCompilerTest extends GroovyCompilerTestCase {
 
     Module dep = addDependentModule();
 
-    addGroovyLibrary(dep);
+    addGroovyLibrary(dep, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN, "groovy");
 
     assertEmpty(make());
     assertOutput("Bar", "239", dep);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
index 35fde0819569..68301b376eac 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
@@ -41,7 +41,6 @@ import com.intellij.testFramework.fixtures.impl.TempDirTestFixtureImpl;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.ui.UIUtil;
-import org.jetbrains.plugins.groovy.config.GroovyConfigUtils;
 import org.jetbrains.plugins.groovy.util.GroovyUtils;
 
 import javax.swing.*;
@@ -80,11 +79,11 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC
     super.tuneFixture(moduleBuilder);
   }
 
-  protected static void addGroovyLibrary(final Module to) {
+  protected static void addGroovyLibrary(final Module to, String groovyJarPattern, final String libName) {
     final String root = PluginPathManager.getPluginHomePath("groovy") + "/../../lib/";
-    final File[] groovyJars = GroovyUtils.getFilesInDirectoryByPattern(root, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN);
+    final File[] groovyJars = GroovyUtils.getFilesInDirectoryByPattern(root, groovyJarPattern);
     assert groovyJars.length == 1;
-    PsiTestUtil.addLibrary(to, "groovy", root, groovyJars[0].getName());
+    PsiTestUtil.addLibrary(to, libName, root, groovyJars[0].getName());
   }
 
   @Override
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.gpp
similarity index 100%
rename from plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
rename to plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.gpp
diff --git a/plugins/groovy/testdata/realGroovypp/groovypp-all-0.2.13.jar b/plugins/groovy/testdata/realGroovypp/groovypp-all-0.2.13.jar
deleted file mode 100644
index 38fb41b3cd1c..000000000000
Binary files a/plugins/groovy/testdata/realGroovypp/groovypp-all-0.2.13.jar and /dev/null differ