diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
index f91f88dedbe..e1330b9845d 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
@@ -16,12 +16,27 @@
 
 package org.jetbrains.kotlin.j2k
 
+import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.idea.j2k.IdeaNewJavaToKotlinServices
+import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor
+import org.jetbrains.kotlin.psi.KtPsiFactory
 
 abstract class AbstractNewJavaToKotlinConverterNewSingleFileTest : AbstractJavaToKotlinConverterSingleFileTest() {
 
     override fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String {
         val file = createJavaFile(text)
-        return NewJavaToKotlinConverter(project, settings).filesToKotlin(listOf(file)).single()
+        val factory = KtPsiFactory(project, true)
+        val postProcessor = J2kPostProcessor(true)
+
+
+        return NewJavaToKotlinConverter(project, settings, IdeaNewJavaToKotlinServices).filesToKotlin(listOf(file)).map {
+            factory.createFileWithLightClassSupport("Dummy.kt", it, file)
+        }.map {
+            CommandProcessor.getInstance().runUndoTransparentAction {
+                postProcessor.doAdditionalProcessing(it, null)
+            }
+            it.text
+        }.single()
     }
 }
\ No newline at end of file
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
index 76744fd197f..ecb95455709 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
@@ -16,12 +16,27 @@
 
 package org.jetbrains.kotlin.j2k
 
+import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.idea.j2k.IdeaNewJavaToKotlinServices
+import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor
+import org.jetbrains.kotlin.psi.KtPsiFactory
 
 abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterSingleFileTest() {
 
     override fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String {
         val file = createJavaFile(text)
-        return NewJavaToKotlinConverter(project, settings).filesToKotlin(listOf(file)).single()
+        val factory = KtPsiFactory(project, true)
+        val postProcessor = J2kPostProcessor(true)
+
+
+        return NewJavaToKotlinConverter(project, settings, IdeaNewJavaToKotlinServices).filesToKotlin(listOf(file)).map {
+            factory.createFileWithLightClassSupport("Dummy.kt", it, file)
+        }.map {
+            CommandProcessor.getInstance().runUndoTransparentAction {
+                postProcessor.doAdditionalProcessing(it, null)
+            }
+            it.text
+        }.single()
     }
 }
\ No newline at end of file