diff --git a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithJvmDefaultImplementation.txt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithJvmDefaultImplementation.txt
index 51b403303cf..68aab8e4986 100644
--- a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithJvmDefaultImplementation.txt
+++ b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithJvmDefaultImplementation.txt
@@ -1,3 +1,3 @@
 // LANGUAGE_LEVEL 1.8
 // WITH_RUNTIME
-// KOTLINC_EXTRA_OPTS -jvm-target, 1.8, -Xjvm-default=enable
\ No newline at end of file
+// COMPILER_ARGUMENTS: -jvm-target, 1.8, -Xjvm-default=enable
\ No newline at end of file
diff --git a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceWithJvmStatic.txt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceWithJvmStatic.txt
index a1b4acfa9e3..40839e9100a 100644
--- a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceWithJvmStatic.txt
+++ b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/InterfaceWithJvmStatic.txt
@@ -1,3 +1,3 @@
 // LANGUAGE_LEVEL 1.8
 // WITH_RUNTIME
-// KOTLINC_EXTRA_OPTS -jvm-target, 1.8
\ No newline at end of file
+// COMPILER_ARGUMENTS: -jvm-target, 1.8
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
index af86de54107..a3630a655de 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.io.FileUtilRt
 import org.jetbrains.kotlin.idea.test.AstAccessControl
+import org.jetbrains.kotlin.idea.test.CompilerTestDirectives
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.KotlinTestUtils
@@ -23,12 +24,14 @@ abstract class AbstractJavaAgainstKotlinBinariesCheckerTest : AbstractJavaAgains
             return
         }
 
-        val languageLevelOption = InTextDirectivesUtils.findListWithPrefixes(configFileText ?: "", "// KOTLINC_EXTRA_OPTS")
+        val compilerArguments = InTextDirectivesUtils.findListWithPrefixes(
+            configFileText ?: "", CompilerTestDirectives.COMPILER_ARGUMENTS_DIRECTIVE
+        )
 
         val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(
             PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/javaAgainstKotlin/" + getTestName(false) + ".kt",
             "libFor$testName",
-            extraOptions = languageLevelOption
+            extraOptions = compilerArguments
         )
         val jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.absolutePath) + "!/"
         ModuleRootModificationUtil.addModuleLibrary(module, jarUrl)
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
index e9a8e873785..e912c471ca0 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.kt
@@ -6,10 +6,22 @@
 package org.jetbrains.kotlin.checkers
 
 import org.jetbrains.kotlin.idea.perf.forceUsingOldLightClassesForTest
+import org.jetbrains.kotlin.idea.test.withCustomCompilerOptions
 
 abstract class AbstractJavaAgainstKotlinSourceCheckerTest : AbstractJavaAgainstKotlinCheckerTest() {
     fun doTest(path: String) {
-        doTest(true, true, path.replace(".kt", ".java"), path)
+        fun doTest() {
+            doTest(true, true, path.replace(".kt", ".java"), path)
+        }
+
+        val configFile = configFileText
+        if (configFile != null) {
+            withCustomCompilerOptions(configFile, project, module) {
+                doTest()
+            }
+        } else {
+            doTest()
+        }
     }
 }