diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanOldStoredDataTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanOldStoredDataTask.kt
index 7ba76f05627..0b15a2cf97a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanOldStoredDataTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanOldStoredDataTask.kt
@@ -15,7 +15,7 @@ import java.time.*
  * Task to clean all old loaded files based on a last modification date.
  * All registered store in {@link CleanableStore} would be cleaned
  */
-class CleanOldStoredDataTask : DefaultTask() {
+open class CleanOldStoredDataTask : DefaultTask() {
 
     /**
      * Time to live in days
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessageOutputStreamHandlerTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessageOutputStreamHandlerTest.kt
index b6a8e1ec8c2..4f522c97432 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessageOutputStreamHandlerTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessageOutputStreamHandlerTest.kt
@@ -7,9 +7,7 @@ package org.jetbrains.kotlin.gradle.internal.testing
 
 import jetbrains.buildServer.messages.serviceMessages.ServiceMessage
 import jetbrains.buildServer.messages.serviceMessages.ServiceMessageParserCallback
-import org.jetbrains.kotlin.test.RunnerWithIgnoreInDatabase
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.slf4j.event.EventRecodingLogger
 import org.slf4j.event.SubstituteLoggingEvent
 import org.slf4j.helpers.SubstituteLogger
@@ -17,12 +15,11 @@ import java.text.ParseException
 import java.util.concurrent.ArrayBlockingQueue
 import kotlin.test.assertEquals
 
-@RunWith(RunnerWithIgnoreInDatabase::class)
 class TCServiceMessageOutputStreamHandlerTest {
     private val client = Mock()
     private val logEvents = ArrayBlockingQueue<SubstituteLoggingEvent>(10)
     private val log = EventRecodingLogger(SubstituteLogger("", logEvents, false), logEvents)
-    private val handler = TCServiceMessageOutputStreamHandler(client, {}, log, 30)
+    private val handler = TCServiceMessageOutputStreamHandler(client, {}, log, 35)
 
     private val clientCalls get() = client.log.toString()
     private val logString get() = logEvents.map { it.message }.toString()
@@ -69,17 +66,18 @@ class TCServiceMessageOutputStreamHandlerTest {
 
     @Test
     fun testFlush() {
+        //testStarted key correspond to [jetbrains.buildServer.messages.serviceMessages.TestStarted] class and requires "name" attribute
         handler.write("xxx##teamc".toByteArray())
         handler.flush()
-        handler.write("ity[testStarted]\n".toByteArray())
-        handler.write("yyy##teamcity[testStarted]".toByteArray())
+        handler.write("ity[testStarted name='test']\n".toByteArray())
+        handler.write("yyy##teamcity[testStarted name='test']".toByteArray())
         handler.close()
         assertEquals(
             "TEXT: `xxx`\n" +
-                    "MESSAGE: `##teamcity[testStarted]`\n" +
+                    "MESSAGE: `##teamcity[testStarted name='test']`\n" +
                     "TEXT: `\n`\n" + // this will be ignore in org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient.regularText
                     "TEXT: `yyy`\n" +
-                    "MESSAGE: `##teamcity[testStarted]`\n",
+                    "MESSAGE: `##teamcity[testStarted name='test']`\n",
             clientCalls
         )
         assertEquals("[]", logString)
@@ -87,15 +85,16 @@ class TCServiceMessageOutputStreamHandlerTest {
 
     @Test
     fun testMessage() {
-        handler.write("xxx##teamcity[testStarted]\n".toByteArray())
-        handler.write("yyy##teamcity[testStarted]".toByteArray())
+        //testStarted key correspond to [jetbrains.buildServer.messages.serviceMessages.TestStarted] class and requires "name" attribute
+        handler.write("xxx##teamcity[testStarted name='test']\n".toByteArray())
+        handler.write("yyy##teamcity[testStarted name='test']".toByteArray())
         handler.close()
         assertEquals(
             "TEXT: `xxx`\n" +
-                    "MESSAGE: `##teamcity[testStarted]`\n" +
+                    "MESSAGE: `##teamcity[testStarted name='test']`\n" +
                     "TEXT: `\n`\n" + // this will be ignore in org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient.regularText
                     "TEXT: `yyy`\n" +
-                    "MESSAGE: `##teamcity[testStarted]`\n",
+                    "MESSAGE: `##teamcity[testStarted name='test']`\n",
             clientCalls
         )
         assertEquals("[]", logString)
@@ -103,16 +102,17 @@ class TCServiceMessageOutputStreamHandlerTest {
 
     @Test
     fun testMessageSplit() {
+        //testStarted key correspond to [jetbrains.buildServer.messages.serviceMessages.TestStarted] class and requires "name" attribute
         handler.write("xxx##teamc".toByteArray())
-        handler.write("ity[testStarted]\n".toByteArray())
-        handler.write("yyy##teamcity[testStarted]".toByteArray())
+        handler.write("ity[testStarted name='test']\n".toByteArray())
+        handler.write("yyy##teamcity[testStarted name='test']".toByteArray())
         handler.close()
         assertEquals(
             "TEXT: `xxx`\n" +
-                    "MESSAGE: `##teamcity[testStarted]`\n" +
+                    "MESSAGE: `##teamcity[testStarted name='test']`\n" +
                     "TEXT: `\n`\n" + // this will be ignore in org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient.regularText
                     "TEXT: `yyy`\n" +
-                    "MESSAGE: `##teamcity[testStarted]`\n",
+                    "MESSAGE: `##teamcity[testStarted name='test']`\n",
             clientCalls
         )
         assertEquals("[]", logString)
@@ -121,13 +121,13 @@ class TCServiceMessageOutputStreamHandlerTest {
     @Test
     fun testNoOverflowNL() {
         // "##teamcity[]".length = 12
-        // 30 - 12 = 18
+        // 35 - 12 = 23
         //                                     | <- limit here
-        handler.write("012345##teamcity[12345678901234567]\n".toByteArray())
+        handler.write("012345##teamcity[1234567890123456789012]\n".toByteArray())
         handler.close()
         assertEquals(
             "TEXT: `012345`\n" +
-                    "MESSAGE: `##teamcity[12345678901234567]`\n" +
+                    "MESSAGE: `##teamcity[1234567890123456789012]`\n" +
                     "TEXT: `\n`\n",
             clientCalls
         )
@@ -138,13 +138,13 @@ class TCServiceMessageOutputStreamHandlerTest {
     @Test
     fun testNoOverflowNoNL() {
         // "##teamcity[]".length = 12
-        // 30 - 12 = 18
-        //                                     | <- limit here
-        handler.write("012345##teamcity[123456789012345678]\n".toByteArray())
+        // 35 - 12 = 23
+        //                                          | <- limit here
+        handler.write("012345##teamcity[12345678901234567890123]\n".toByteArray())
         handler.close()
         assertEquals(
             "TEXT: `012345`\n" +
-                    "MESSAGE: `##teamcity[123456789012345678]`\n" +
+                    "MESSAGE: `##teamcity[12345678901234567890123]`\n" +
                     "TEXT: `\n`\n",
             clientCalls
         )
@@ -154,13 +154,13 @@ class TCServiceMessageOutputStreamHandlerTest {
     @Test
     fun testOverflow() {
         // "##teamcity[]".length = 12
-        // 30 - 12 = 18
-        //                                     | <- limit here
-        handler.write("012345##teamcity[1234567890123456789]\n".toByteArray())
+        // 35 - 12 = 23
+        //                                         | <- limit here
+        handler.write("012345##teamcity[123456789012345678901234]\n".toByteArray())
         handler.close()
         assertEquals(
             "TEXT: `012345`\n" +
-                    "TEXT: `##teamcity[1234567890123456789`\n" +
+                    "EXCEPTION: `java.text.ParseException: The service message is invalid because it does not end with ] character: ##teamcity[123456789012345678901234`, `##teamcity[123456789012345678901234`\n" +
                     "TEXT: `]\n`\n",
             clientCalls
         )
@@ -174,7 +174,7 @@ class TCServiceMessageOutputStreamHandlerTest {
         val log = StringBuffer()
 
         override fun parseException(p0: ParseException, p1: String) {
-            log.append("EXCEPTION `$p0`, `$p1`\n")
+            log.append("EXCEPTION: `$p0`, `$p1`\n")
         }
 
         override fun serviceMessage(p0: ServiceMessage) {
diff --git a/tests/mute-platform.csv b/tests/mute-platform.csv
index e8d23553838..2b1d017031f 100644
--- a/tests/mute-platform.csv
+++ b/tests/mute-platform.csv
@@ -12,10 +12,6 @@ org.jetbrains.kotlin.gradle.ImportAndCheckHighlighting.testMultiplatformLibrary[
 org.jetbrains.kotlin.gradle.ImportAndCheckHighlighting.testMultiplatformLibrary[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable], KT-35631
 org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225
 org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225
-org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testFlush, KT-35938
-org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testMessage, KT-35938
-org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testMessageSplit, KT-35938
-org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testOverflow, KT-35938
 org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run
 org.jetbrains.kotlin.idea.caches.resolve.MultiPlatformHighlightingTestGenerated.testMultifileFacade, KT-34689 invalid light class
 org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed