diff --git a/platform/testFramework/junit5/src/fixture/fixtures.kt b/platform/testFramework/junit5/src/fixture/fixtures.kt
index b86a29eb60f6..e2ca9ad61689 100644
--- a/platform/testFramework/junit5/src/fixture/fixtures.kt
+++ b/platform/testFramework/junit5/src/fixture/fixtures.kt
@@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ex.ProjectManagerEx
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
+import com.intellij.openapi.util.Computable
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.io.toCanonicalPath
 import com.intellij.openapi.vfs.VfsUtil
@@ -271,9 +272,9 @@ fun TestFixture<PsiDirectory>.psiFileFixture(
 ): TestFixture<PsiFile> = testFixture { _ ->
   val project = this@psiFileFixture.init().project
   val virtualFile = virtualFileFixture(name, content).init()
-  val file = readAction {
+  val file = PsiDocumentManager.getInstance(project).commitAndRunReadAction(Computable {
     PsiManager.getInstance(project).findFile(virtualFile) ?: error("Fail to find file $virtualFile")
-  }
+  })
   initialized(file) {/*nothing*/ }
 }