diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/classWithInitializer/after/target/Test.k2.kt b/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/classWithInitializer/after/target/Test.k2.kt
deleted file mode 100644
index 2a3df31285f0..000000000000
--- a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/classWithInitializer/after/target/Test.k2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package target
-
-class Test {
-    init {
-        source.X()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionExtensionMemberRef/after/target/Foo.k2.kt b/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionExtensionMemberRef/after/target/Foo.k2.kt
deleted file mode 100644
index 480d69d66678..000000000000
--- a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionExtensionMemberRef/after/target/Foo.k2.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package target
-
-import source.logExt
-import source.loggerExt
-
-class Foo {
-    companion object : source.Klogging()
-
-    fun baz() {
-        loggerExt.debug { "something" }
-        logExt("something")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionMemberRefDelegation/after/target/Foo.k2.kt b/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionMemberRefDelegation/after/target/Foo.k2.kt
deleted file mode 100644
index 00216959ab7b..000000000000
--- a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionMemberRefDelegation/after/target/Foo.k2.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package target
-
-class Foo {
-    companion object : source.ILogging by source.Klogging()
-
-    fun baz() {
-        logger.debug { "something" }
-        log("something")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionMemberRefFakeOverride/after/target/Foo.k2.kt b/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionMemberRefFakeOverride/after/target/Foo.k2.kt
deleted file mode 100644
index 2779cedec480..000000000000
--- a/plugins/kotlin/idea/tests/testData/refactoring/moveTopLevel/kotlin/companionMemberRefFakeOverride/after/target/Foo.k2.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package target
-
-class Foo {
-    companion object : source.Klogging()
-
-    fun baz() {
-        logger.debug { "something" }
-        log("something")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt b/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
index 745cc2c8d9fe..f08e2eeceb0b 100644
--- a/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
+++ b/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.test
 
@@ -9,6 +9,7 @@ import com.intellij.openapi.application.invokeAndWaitIfNeeded
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.diagnostic.ControlFlowException
 import com.intellij.openapi.editor.Document
+import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
@@ -111,6 +112,7 @@ fun Document.extractMultipleMarkerOffsets(project: Project, caretMarker: String
     }
 
     PsiDocumentManager.getInstance(project).commitAllDocuments()
+    FileDocumentManager.getInstance().saveAllDocuments()
     PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(this)
 
     return offsets