diff --git a/.idea/modules.xml b/.idea/modules.xml
index a38872c3f4fd..b1a529e2c997 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -676,6 +676,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.iml" />
       <module fileurl="file://$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.tests.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/completion-ranker/intellij.statsCollector.completionRanker.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/features/intellij.statsCollector.features.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/features/intellij.statsCollector.features.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/log-events/intellij.statsCollector.logEvents.iml" />
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index fefe6db8ad16..24b46cb628a7 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -136,5 +136,6 @@
     <orderEntry type="module" module-name="intellij.sh" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.gradle.java.maven" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.markdown" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.statsCollector.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/stats-collector/intellij.statsCollector.iml b/plugins/stats-collector/intellij.statsCollector.iml
index e2245407d8c7..bbd66d6d7f1b 100644
--- a/plugins/stats-collector/intellij.statsCollector.iml
+++ b/plugins/stats-collector/intellij.statsCollector.iml
@@ -5,7 +5,6 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -15,12 +14,8 @@
     <orderEntry type="library" name="http-client" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
-    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.statsCollector.features" />
     <orderEntry type="module" module-name="intellij.statsCollector.logEvents" />
-    <orderEntry type="library" name="commons-codec" level="project" />
     <orderEntry type="library" name="fluent-hc" level="project" />
     <orderEntry type="module" module-name="intellij.statsCollector.completionRanker" />
   </component>
diff --git a/plugins/stats-collector/intellij.statsCollector.tests.iml b/plugins/stats-collector/intellij.statsCollector.tests.iml
new file mode 100644
index 000000000000..b835a2fc1db9
--- /dev/null
+++ b/plugins/stats-collector/intellij.statsCollector.tests.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/test">
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/testResources" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
+    <orderEntry type="library" scope="TEST" name="commons-codec" level="project" />
+    <orderEntry type="module" module-name="intellij.statsCollector.features" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.statsCollector.logEvents" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.statsCollector" scope="TEST" />
+  </component>
+</module>
\ No newline at end of file