diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
index 168c1958f0d..5e85ae38089 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
@@ -22,6 +22,7 @@ import com.intellij.debugger.SourcePosition
 import com.intellij.debugger.engine.DebugProcessImpl
 import com.intellij.debugger.engine.MethodFilter
 import com.intellij.debugger.engine.SuspendContextImpl
+import com.intellij.debugger.engine.SuspendContextRunnable
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
 import com.intellij.debugger.impl.DebuggerContextImpl
 import com.intellij.debugger.impl.PositionUtil
@@ -115,11 +116,11 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
         get() = getDebugProcess() ?: throw AssertionError("createLocalProcess() should be called before getDebugProcess()")
 
     public fun doOnBreakpoint(action: SuspendContextImpl.() -> Unit) {
-        super.onBreakpoint {
+        super.onBreakpoint(SuspendContextRunnable {
             initContexts(it)
             it.printContext()
             it.action()
-        }
+        })
     }
 
     protected fun initContexts(suspendContext: SuspendContextImpl) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt
index ae2d3fe9450..b2ff687f103 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt
@@ -26,13 +26,13 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.text.StringUtil
-import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileVisitor
 import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
+import com.intellij.refactoring.MultiFileTestCase
 import com.intellij.refactoring.rename.RenameProcessor
 import com.intellij.refactoring.rename.RenamePsiElementProcessor
 import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
@@ -49,9 +49,7 @@ import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.name.*
 import org.jetbrains.kotlin.psi.JetFile
-import org.jetbrains.kotlin.psi.JetNamedDeclaration
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies
@@ -279,14 +277,12 @@ public abstract class AbstractRenameTest : KotlinMultiFileTestCase() {
     }
 
     protected fun doTestCommittingDocuments(action : (VirtualFile, VirtualFile?) -> Unit) {
-        super.doTest(
-                { rootDir, rootAfter ->
-                    action(rootDir, rootAfter)
+        super.doTest(MultiFileTestCase.PerformAction { rootDir, rootAfter ->
+            action(rootDir, rootAfter)
 
-                    PsiDocumentManager.getInstance(getProject()!!).commitAllDocuments()
-                    FileDocumentManager.getInstance().saveAllDocuments()
-                },
-                getTestDirName(true))
+            PsiDocumentManager.getInstance(getProject()!!).commitAllDocuments()
+            FileDocumentManager.getInstance().saveAllDocuments()
+        }, getTestDirName(true))
     }
 
     protected override fun getTestRoot() : String {