diff --git a/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java
similarity index 100%
rename from jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java
rename to compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java
diff --git a/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java
similarity index 100%
rename from jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java
rename to compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java
diff --git a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt
index 1e79b8ceabf..c5869f2192e 100644
--- a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt
@@ -42,9 +42,10 @@ fun main(args: Array<String>) {
         execProtoc(commonProto, "compiler/frontend/serialization/src")
         execProtoc(javaProto, "core/serialization.java/src")
 
-        modifyAndExecProtoc(commonProto, "jps-plugin/test")
-        modifyAndExecProtoc(javaProto, "jps-plugin/test")
-    } finally {
+        modifyAndExecProtoc(commonProto, "compiler/tests")
+        modifyAndExecProtoc(javaProto, "compiler/tests")
+    }
+    finally {
         // Workaround for JVM hanging: IDEA's process handler creates thread pool
         System.exit(0)
     }
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index 4f321f16eb3..37590a836e4 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -16,6 +16,7 @@
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
     <orderEntry type="module" module-name="backend" scope="TEST" />
     <orderEntry type="module" module-name="descriptors" scope="TEST" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
   </component>
 </module>