diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
index a4ab53b80f3..e27e2f7b793 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
@@ -90,7 +90,7 @@ public abstract class AbstractJetMoveTest : MultiFileTestCase() {
         val mainFilePath = config.getNullableString("mainFile")!!
 
         val conflictFile = File(testDir + "/conflicts.txt")
-        doTest { rootDir, rootAfter ->
+        doTest({ rootDir, rootAfter ->
             val mainFile = rootDir.findFileByRelativePath(mainFilePath)!!
             val mainPsiFile = PsiManager.getInstance(getProject()!!).findFile(mainFile)!!
             val document = FileDocumentManager.getInstance().getDocument(mainFile)!!
@@ -120,7 +120,8 @@ public abstract class AbstractJetMoveTest : MultiFileTestCase() {
 
                 EditorFactory.getInstance()!!.releaseEditor(editor)
             }
-        }
+        },
+        getTestDirName(true))
     }
 
     protected fun getTestDirName(lowercaseFirstLetter : Boolean) : String {
@@ -128,10 +129,6 @@ public abstract class AbstractJetMoveTest : MultiFileTestCase() {
         return testName.substring(0, testName.lastIndexOf('_')).replace('_', '/')
     }
 
-    protected fun doTest(action : (VirtualFile, VirtualFile?) -> Unit) {
-        super.doTest(action, getTestDirName(true))
-    }
-
     protected override fun getTestRoot() : String {
         return "/refactoring/move/"
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
index acf4d380a43..c38b8badb14 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
@@ -109,7 +109,7 @@ public abstract class AbstractRenameTest : MultiFileTestCase() {
         val classFQN = renameParamsObject.getString("classFQN")
         val newName = renameParamsObject.getString("newName")
 
-        doTest { rootDir, rootAfter ->
+        doTestCommittingDocuments { rootDir, rootAfter ->
             val aClass = context.javaFacade.findClass(classFQN, context.project.allScope())!!
             val substitution = RenamePsiElementProcessor.forElement(aClass).substituteElementToRename(aClass, null)
 
@@ -122,7 +122,7 @@ public abstract class AbstractRenameTest : MultiFileTestCase() {
         val methodSignature = renameParamsObject.getString("methodSignature")
         val newName = renameParamsObject.getString("newName")
 
-        doTest { rootDir, rootAfter ->
+        doTestCommittingDocuments { rootDir, rootAfter ->
             val aClass = context.javaFacade.findClass(classFQN, GlobalSearchScope.moduleScope(context.module))!!
 
             val methodText = context.javaFacade.getElementFactory().createMethodFromText(methodSignature + "{}", null)
@@ -162,7 +162,7 @@ public abstract class AbstractRenameTest : MultiFileTestCase() {
         val newName = renameParamsObject.getString("newName")
         val mainFilePath = renameParamsObject.getNullableString("mainFile") ?: "${getTestDirName(false)}.kt"
 
-        doTest { rootDir, rootAfter ->
+        doTestCommittingDocuments { rootDir, rootAfter ->
             val mainFile = rootDir.findChild(mainFilePath)!!
             val document = FileDocumentManager.getInstance()!!.getDocument(mainFile)!!
             val jetFile = PsiDocumentManager.getInstance(context.project).getPsiFile(document) as JetFile
@@ -187,7 +187,7 @@ public abstract class AbstractRenameTest : MultiFileTestCase() {
         val newName = renameParamsObject.getString("newName")
         val mainFilePath = renameParamsObject.getNullableString("mainFile") ?: "${getTestDirName(false)}.kt"
 
-        doTest { rootDir, rootAfter ->
+        doTestCommittingDocuments { rootDir, rootAfter ->
             val mainFile = rootDir.findChild(mainFilePath)!!
             val document = FileDocumentManager.getInstance()!!.getDocument(mainFile)!!
             val jetFile = PsiDocumentManager.getInstance(context.project).getPsiFile(document) as JetFile
@@ -208,7 +208,7 @@ public abstract class AbstractRenameTest : MultiFileTestCase() {
         return testName.substring(0, testName.indexOf('_'))
     }
 
-    protected fun doTest(action : (VirtualFile, VirtualFile?) -> Unit) {
+    protected fun doTestCommittingDocuments(action : (VirtualFile, VirtualFile?) -> Unit) {
         super.doTest(
                 { rootDir, rootAfter ->
                     action(rootDir, rootAfter)