diff --git a/.idea/modules.xml b/.idea/modules.xml
index c966b45a56f6..64ffdfd4d231 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -819,6 +819,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/statistics/config/intellij.platform.statistics.config.iml" filepath="$PROJECT_DIR$/platform/statistics/config/intellij.platform.statistics.config.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/statistics/devkit/intellij.platform.statistics.devkit.iml" filepath="$PROJECT_DIR$/platform/statistics/devkit/intellij.platform.statistics.devkit.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/statistics/envTests/intellij.platform.statistics.envTests.iml" filepath="$PROJECT_DIR$/platform/statistics/envTests/intellij.platform.statistics.envTests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/statistics/testFramework/intellij.platform.statistics.testFramework.iml" filepath="$PROJECT_DIR$/platform/statistics/testFramework/intellij.platform.statistics.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/statistics/uploader/intellij.platform.statistics.uploader.iml" filepath="$PROJECT_DIR$/platform/statistics/uploader/intellij.platform.statistics.uploader.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml" />
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index 4ae0bfb911f6..efd6df3c12a9 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -97,5 +97,6 @@
     <orderEntry type="library" scope="TEST" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.todo" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index 82a58af77122..fb87db6a6bd9 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -58,5 +58,6 @@
     <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5.eel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/ml-impl/intellij.platform.ml.impl.iml b/platform/ml-impl/intellij.platform.ml.impl.iml
index 17a6655497eb..783414341d39 100644
--- a/platform/ml-impl/intellij.platform.ml.impl.iml
+++ b/platform/ml-impl/intellij.platform.ml.impl.iml
@@ -54,5 +54,6 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="library" exported="" name="jetbrains.mlapi.ml.tools" level="project" />
     <orderEntry type="library" exported="" name="jetbrains.mlapi.ml.tools.suspendable" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index 4520306aea8e..720305e72df7 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -117,5 +117,6 @@
     <orderEntry type="library" scope="TEST" name="io.mockk" level="project" />
     <orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
     <orderEntry type="module" module-name="intellij.platform.bookmarks" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/statistics/testFramework/intellij.platform.statistics.testFramework.iml b/platform/statistics/testFramework/intellij.platform.statistics.testFramework.iml
new file mode 100644
index 000000000000..0823177f3be2
--- /dev/null
+++ b/platform/statistics/testFramework/intellij.platform.statistics.testFramework.iml
@@ -0,0 +1,16 @@
+<?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$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.intellij.internal.statistic" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.uploader" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/platform/statistics/test/com/intellij/internal/statistic/FUCollectorTestCase.kt b/platform/statistics/testFramework/src/FUCollectorTestCase.kt
similarity index 100%
rename from platform/statistics/test/com/intellij/internal/statistic/FUCollectorTestCase.kt
rename to platform/statistics/testFramework/src/FUCollectorTestCase.kt
diff --git a/platform/statistics/test/com/intellij/internal/statistic/TestStatisticsEventLogger.kt b/platform/statistics/testFramework/src/TestStatisticsEventLogger.kt
similarity index 100%
rename from platform/statistics/test/com/intellij/internal/statistic/TestStatisticsEventLogger.kt
rename to platform/statistics/testFramework/src/TestStatisticsEventLogger.kt
diff --git a/platform/statistics/test/com/intellij/internal/statistic/TestStatisticsEventLoggerProvider.kt b/platform/statistics/testFramework/src/TestStatisticsEventLoggerProvider.kt
similarity index 100%
rename from platform/statistics/test/com/intellij/internal/statistic/TestStatisticsEventLoggerProvider.kt
rename to platform/statistics/testFramework/src/TestStatisticsEventLoggerProvider.kt
diff --git a/platform/statistics/test/com/intellij/internal/statistic/TestStatisticsEventValidator.kt b/platform/statistics/testFramework/src/TestStatisticsEventValidator.kt
similarity index 100%
rename from platform/statistics/test/com/intellij/internal/statistic/TestStatisticsEventValidator.kt
rename to platform/statistics/testFramework/src/TestStatisticsEventValidator.kt
diff --git a/plugins/filePrediction/intellij.filePrediction.iml b/plugins/filePrediction/intellij.filePrediction.iml
index e175de05c219..a40200c76041 100644
--- a/plugins/filePrediction/intellij.filePrediction.iml
+++ b/plugins/filePrediction/intellij.filePrediction.iml
@@ -47,5 +47,6 @@
     <orderEntry type="module" module-name="intellij.platform.ml.impl" />
     <orderEntry type="library" name="ngram-slp" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/java/intellij.gradle.java.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml
index 88dc2f2b92aa..cb91f1685c71 100644
--- a/plugins/gradle/java/intellij.gradle.java.tests.iml
+++ b/plugins/gradle/java/intellij.gradle.java.tests.iml
@@ -46,5 +46,6 @@
     <orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.maven" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/test-framework/kotlin.test-framework.iml b/plugins/kotlin/test-framework/kotlin.test-framework.iml
index b21a2e79350f..52edf4ef5e60 100644
--- a/plugins/kotlin/test-framework/kotlin.test-framework.iml
+++ b/plugins/kotlin/test-framework/kotlin.test-framework.iml
@@ -49,5 +49,6 @@
     <orderEntry type="module" module-name="kotlin.base.external-build-system" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.project-structure" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5Pioneer" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/maven/src/test/intellij.maven.tests.iml b/plugins/maven/src/test/intellij.maven.tests.iml
index 68f881c885c2..d032dc8a304c 100644
--- a/plugins/maven/src/test/intellij.maven.tests.iml
+++ b/plugins/maven/src/test/intellij.maven.tests.iml
@@ -40,5 +40,6 @@
     <orderEntry type="library" scope="TEST" name="hash4j" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinx-serialization-core" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml
index 4058bf423786..e892b16321a2 100644
--- a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml
+++ b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml
@@ -153,5 +153,6 @@
     <orderEntry type="module" module-name="intellij.searchEverywhereMl.ranking.ext" />
     <orderEntry type="module" module-name="intellij.searchEverywhereMl" />
     <orderEntry type="module" module-name="intellij.platform.bookmarks" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file