diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt
index 1d4fec7f017..6f400aa139a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt
@@ -22,10 +22,8 @@ import com.intellij.refactoring.util.CommonRefactoringUtil
 import com.intellij.testFramework.PlatformTestUtil
 import junit.framework.ComparisonFailure
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
-import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils
-import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.withCustomCompilerOptions
+import org.jetbrains.kotlin.formatter.FormatSettingsUtil
+import org.jetbrains.kotlin.idea.test.*
 import org.jetbrains.kotlin.idea.util.application.executeCommand
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.psi.KtFile
@@ -103,24 +101,27 @@ abstract class AbstractIntentionTest : KotlinLightCodeInsightFixtureTestCase() {
         val fileText = FileUtil.loadFile(mainFile, true)
         withCustomCompilerOptions(fileText, project, module) {
             ConfigLibraryUtil.configureLibrariesByDirective(module, PlatformTestUtil.getCommunityPath(), fileText)
+            configureCodeStyleAndRun(project, { FormatSettingsUtil.createConfigurator(fileText, it).configureSettings() }) {
+                configureRegistryAndRun(fileText) {
+                    try {
+                        TestCase.assertTrue("\"<caret>\" is missing in file \"$mainFile\"", fileText.contains("<caret>"))
 
-            try {
-                TestCase.assertTrue("\"<caret>\" is missing in file \"$mainFile\"", fileText.contains("<caret>"))
+                        val minJavaVersion = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// MIN_JAVA_VERSION: ")
+                        if (minJavaVersion != null && !SystemInfo.isJavaVersionAtLeast(minJavaVersion)) return@configureRegistryAndRun
 
-                val minJavaVersion = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// MIN_JAVA_VERSION: ")
-                if (minJavaVersion != null && !SystemInfo.isJavaVersionAtLeast(minJavaVersion)) return@withCustomCompilerOptions
+                        if (file is KtFile && !InTextDirectivesUtils.isDirectiveDefined(fileText, "// SKIP_ERRORS_BEFORE")) {
+                            DirectiveBasedActionUtils.checkForUnexpectedErrors(file as KtFile)
+                        }
 
-                if (file is KtFile && !InTextDirectivesUtils.isDirectiveDefined(fileText, "// SKIP_ERRORS_BEFORE")) {
-                    DirectiveBasedActionUtils.checkForUnexpectedErrors(file as KtFile)
+                        doTestFor(mainFile.name, pathToFiles, intentionAction, fileText)
+
+                        if (file is KtFile && !InTextDirectivesUtils.isDirectiveDefined(fileText, "// SKIP_ERRORS_AFTER")) {
+                            DirectiveBasedActionUtils.checkForUnexpectedErrors(file as KtFile)
+                        }
+                    } finally {
+                        ConfigLibraryUtil.unconfigureLibrariesByDirective(module, fileText)
+                    }
                 }
-
-                doTestFor(mainFile.name, pathToFiles, intentionAction, fileText)
-
-                if (file is KtFile && !InTextDirectivesUtils.isDirectiveDefined(fileText, "// SKIP_ERRORS_AFTER")) {
-                    DirectiveBasedActionUtils.checkForUnexpectedErrors(file as KtFile)
-                }
-            } finally {
-                ConfigLibraryUtil.unconfigureLibrariesByDirective(module, fileText)
             }
         }
     }