diff --git a/libraries/tools/kotlin-gradle-statistics/test/org/jetbrains/kotlin/statistics/BuildSessionLoggerTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/statistics/BuildSessionLoggerTest.kt
similarity index 89%
rename from libraries/tools/kotlin-gradle-statistics/test/org/jetbrains/kotlin/statistics/BuildSessionLoggerTest.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/statistics/BuildSessionLoggerTest.kt
index 25f8906ef74..8b69f11f98d 100644
--- a/libraries/tools/kotlin-gradle-statistics/test/org/jetbrains/kotlin/statistics/BuildSessionLoggerTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/statistics/BuildSessionLoggerTest.kt
@@ -1,12 +1,11 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.statistics
+package org.jetbrains.kotlin.gradle.statistics
 
-import org.jetbrains.kotlin.statistics.BuildSessionLogger.Companion.STATISTICS_FILE_NAME_PATTERN
-import org.jetbrains.kotlin.statistics.BuildSessionLogger.Companion.listProfileFiles
+import org.jetbrains.kotlin.statistics.BuildSessionLogger
 import org.jetbrains.kotlin.statistics.fileloggers.MetricsContainer
 import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics
 import org.jetbrains.kotlin.statistics.metrics.NumericalMetrics
@@ -59,8 +58,8 @@ class BuildSessionLoggerTest {
 
         rootFolder.listFiles().first().listFiles().forEach { file ->
             assertTrue(
-                file.name.matches(STATISTICS_FILE_NAME_PATTERN.toRegex()),
-                "Check that file name ${file.name} matches pattern $STATISTICS_FILE_NAME_PATTERN"
+                file.name.matches(BuildSessionLogger.STATISTICS_FILE_NAME_PATTERN.toRegex()),
+                "Check that file name ${file.name} matches pattern ${BuildSessionLogger.STATISTICS_FILE_NAME_PATTERN}"
             )
         }
     }
@@ -118,18 +117,18 @@ class BuildSessionLoggerTest {
         // files not matching the pattern should not be affected
         assertEquals(
             200,
-            statsFolder.listFiles().filter { !it.name.matches(STATISTICS_FILE_NAME_PATTERN.toRegex()) }.count(),
+            statsFolder.listFiles().filter { !it.name.matches(BuildSessionLogger.STATISTICS_FILE_NAME_PATTERN.toRegex()) }.count(),
             "Some files which should not be affected, were removed"
         )
 
         assertEquals(
             maxFiles,
-            statsFolder.listFiles().filter { it.name.matches(STATISTICS_FILE_NAME_PATTERN.toRegex()) }.count(),
+            statsFolder.listFiles().filter { it.name.matches(BuildSessionLogger.STATISTICS_FILE_NAME_PATTERN.toRegex()) }.count(),
             "Some files which should not be affected, were removed"
         )
         assertEquals(
-            statsFolder.listFiles().filter { it.name.matches(STATISTICS_FILE_NAME_PATTERN.toRegex()) }.sorted(),
-            listProfileFiles(statsFolder)
+            statsFolder.listFiles().filter { it.name.matches(BuildSessionLogger.STATISTICS_FILE_NAME_PATTERN.toRegex()) }.sorted(),
+            BuildSessionLogger.listProfileFiles(statsFolder)
         )
     }
 
diff --git a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
index e8a3f67020c..18ceba29f1d 100644
--- a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts
@@ -12,15 +12,7 @@ dependencies {
 
 sourceSets {
     "main" { projectDefault() }
-    "test" {
-        if (kotlinBuildProperties.isJpsBuildEnabled || kotlinBuildProperties.useFir) {
-            none()
-        } else {
-            none()
-
-//            projectDefault()
-        }
-    }
+    "test" { projectDefault() }
 }
 
 projectTest {
diff --git a/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt b/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt
index b3356bfb9df..1f728481e46 100644
--- a/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt
+++ b/libraries/tools/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt
@@ -24,7 +24,7 @@ class BuildSessionLogger(
 
     companion object {
         const val STATISTICS_FOLDER_NAME = "kotlin-profile"
-        internal const val STATISTICS_FILE_NAME_PATTERN = "\\d{4}-\\d{2}-\\d{2}-\\d{2}-\\d{2}-\\d{2}-\\d{3}.profile"
+        const val STATISTICS_FILE_NAME_PATTERN = "\\d{4}-\\d{2}-\\d{2}-\\d{2}-\\d{2}-\\d{2}-\\d{3}.profile"
 
         private const val DEFAULT_MAX_PROFILE_FILES = 1_000
         private const val DEFAULT_MAX_PROFILE_FILE_SIZE = 100_000L