diff --git a/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy b/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy
index d4d64c7bfdd..67c5d003c6f 100644
--- a/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy
+++ b/idea/resources/org/jetbrains/kotlin/idea/gradle/testing/KotlinMppTestLogger.groovy
@@ -17,7 +17,7 @@ class KotlinMppTestLogger {
         xml.event(type: testEventType) {
             test(id: testDescriptor.id, parentId: testDescriptor.parent?.id ?: '') {
                 if (testDescriptor) {
-                    descriptor(name: testDescriptor.displayName ?: '', className: testDescriptor.classDisplayName ?: '')
+                    descriptor(name: testDescriptor.displayName ?: '', className: testDescriptor.className ?: '')
                 }
                 if (testEvent) {
                     def message = escapeCdata(testEvent.message)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt
index 5136ff6eee4..fb76ed8a24f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt
@@ -432,6 +432,7 @@ internal open class TCServiceMessagesClient(
 
             descriptor = object : DefaultTestSuiteDescriptor(id, fullName) {
                 override fun getDisplayName(): String = fullNameWithoutRoot
+                override fun getClassName(): String? = fullNameWithoutRoot
                 override fun getOwnerBuildOperationId(): Any? = rootOperationId
                 override fun getParent(): TestDescriptorInternal = reportingParent.descriptor
                 override fun toString(): String = displayName