diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 2da6fb54ed7..4ccda971bda 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -314,7 +314,7 @@ public abstract class AbstractIncrementalJpsTest(
 
             val mapping = project.dataManager.getSourceToOutputMap(target)
             mapping.sources.forEach {
-                val outputs = mapping.getOutputs(it)!!.sort()
+                val outputs = mapping.getOutputs(it)!!.sorted()
                 if (outputs.isNotEmpty()) {
                     result.println("source $it -> $outputs")
                 }
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 0bcb5bc3135..c41e3a5e127 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -640,7 +640,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
                         """Classpath entry points to a non-existent location: TEST_PATH/some/test.class"""),
                 warnings.map {
                     it.messageText.replace(File("").absolutePath, "TEST_PATH").replace("\\", "/")
-                }.sort().toTypedArray()
+                }.sorted().toTypedArray()
         )
     }
 
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
index f62eca04266..edaa010f617 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
@@ -53,7 +53,7 @@ fun getDirectoryString(dir: File, interestingPaths: List<String>): String {
         val listFiles = dir.listFiles()
         assertNotNull(listFiles)
 
-        val children = listFiles!!.toList().sortBy { it.getName() }.sortBy { it.isDirectory() }
+        val children = listFiles!!.toList().sortedBy { it.getName() }.sortedBy { it.isDirectory() }
         for (child in children) {
             if (child.isDirectory()) {
                 p.println(child.name)
@@ -101,7 +101,7 @@ fun assertEqualDirectories(expected: File, actual: File, forgiveExtraFiles: Bool
     val commonPaths = Sets.intersection(pathsInExpected, pathsInActual)
     val changedPaths = commonPaths
             .filter { DUMP_ALL || !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) }
-            .sort()
+            .sorted()
 
     val expectedString = getDirectoryString(expected, changedPaths)
     val actualString = getDirectoryString(actual, changedPaths)