diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt
index 17f0e1ae88e..558f1e28421 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceTypingIndentationTest.kt
@@ -34,6 +34,16 @@ abstract class AbstractPerformanceTypingIndentationTest : KotlinLightCodeInsight
         ).run()
     }
 
+    private fun testName(): String {
+        val javaClass = this.javaClass
+        val testName = getTestName(false)
+        return if (javaClass.isMemberClass) {
+            "${javaClass.simpleName} - $testName"
+        } else {
+            testName
+        }
+    }
+
     protected fun doPerfTest(unused: String) {
         val testName = getTestName(false)
 
@@ -50,7 +60,7 @@ abstract class AbstractPerformanceTypingIndentationTest : KotlinLightCodeInsight
             configurator.configureSettings()
 
             performanceTest<Unit, Unit> {
-                name(testName)
+                name(testName())
                 stats(stats)
                 warmUpIterations(20)
                 iterations(30)
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
index 80cadd0b4ac..aaeb3296092 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
@@ -49,8 +49,10 @@ data class Benchmark(
         metrics.forEach { it.resetValue() }
     }
 
+    private fun String?.escapeName() = this?.replace(Regex("[^A-Za-z0-9_]"), "_")
+
     fun fileName(): String =
-        listOfNotNull(benchmark, name?.replace("[^A-Za-z0-9_]", ""), buildId?.toString()).joinToString(separator = "_")
+        listOfNotNull(benchmark?.escapeName(), name?.escapeName(), buildId?.toString()).joinToString(separator = "_")
 
     fun cleanUp() {
         metrics?.forEach { it.cleanUp() }