diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
index ab4c29d8288..b7489711c21 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
@@ -61,13 +61,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
 
             compileKotlin {
                 kotlinOptions.jvmTarget = "1.7"
-                kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
+                kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
             }
 
             compileTestKotlin {
                 kotlinOptions.jvmTarget = "1.6"
                 kotlinOptions.apiVersion = "1.0"
-                kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
+                kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
             }
         """)
         importProject()
@@ -77,7 +77,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
             Assert.assertEquals("1.1", apiLevel!!.versionString)
             Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
             Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals("-Xdump-declarations-to=tmp -Xsingle-module",
+            Assert.assertEquals("-Xdump-declarations-to tmp -Xsingle-module",
                                 compilerSettings!!.additionalArguments)
         }
         with (testFacetSettings) {
@@ -85,7 +85,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
             Assert.assertEquals("1.0", apiLevel!!.versionString)
             Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
             Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals("-Xdump-declarations-to=tmpTest",
+            Assert.assertEquals("-Xdump-declarations-to tmpTest",
                                 compilerSettings!!.additionalArguments)
         }
     }
@@ -130,13 +130,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
 
             compileMyMainKotlin {
                 kotlinOptions.jvmTarget = "1.7"
-                kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
+                kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
             }
 
             compileMyTestKotlin {
                 kotlinOptions.jvmTarget = "1.6"
                 kotlinOptions.apiVersion = "1.0"
-                kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
+                kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
             }
         """)
         importProject()
@@ -146,7 +146,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
             Assert.assertEquals("1.1", apiLevel!!.versionString)
             Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
             Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals("-Xdump-declarations-to=tmp -Xsingle-module",
+            Assert.assertEquals("-Xdump-declarations-to tmp -Xsingle-module",
                                 compilerSettings!!.additionalArguments)
         }
         with (facetSettings("project_myTest")) {
@@ -154,7 +154,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
             Assert.assertEquals("1.0", apiLevel!!.versionString)
             Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
             Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
-            Assert.assertEquals("-Xdump-declarations-to=tmpTest",
+            Assert.assertEquals("-Xdump-declarations-to tmpTest",
                                 compilerSettings!!.additionalArguments)
         }
     }
diff --git a/libraries/stdlib/build.gradle b/libraries/stdlib/build.gradle
index 759d38e76f4..b69cfeb2c38 100644
--- a/libraries/stdlib/build.gradle
+++ b/libraries/stdlib/build.gradle
@@ -101,7 +101,7 @@ compileBuiltinsKotlin {
         freeCompilerArgs = [
                 "-version",
                 "-Xallow-kotlin-package",
-                "-Xdump-declarations-to=${buildDir}/runtime-declarations.json",
+                "-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
                 "-cp", "${rootDir}/../dist/builtins",
                 "-module-name", "kotlin-runtime"
         ]
@@ -113,7 +113,7 @@ compileKotlin {
                 "-version",
                 "-Xallow-kotlin-package",
                 "-Xmultifile-parts-inherit",
-                "-Xdump-declarations-to=${buildDir}/stdlib-declarations.json",
+                "-Xdump-declarations-to", "${buildDir}/stdlib-declarations.json",
                 "-module-name", project.name
         ]
     }
diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle
index 3e96579b90d..370b595ff41 100644
--- a/libraries/stdlib/jre7/build.gradle
+++ b/libraries/stdlib/jre7/build.gradle
@@ -48,7 +48,7 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
-            "-Xdump-declarations-to=${buildDir}/stdlib-jre7-declarations.json",
+            "-Xdump-declarations-to", "${buildDir}/stdlib-jre7-declarations.json",
             "-module-name", project.name
     ]
 }
diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle
index 4fe63b6d537..b5dbf0a2586 100644
--- a/libraries/stdlib/jre8/build.gradle
+++ b/libraries/stdlib/jre8/build.gradle
@@ -50,7 +50,7 @@ compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
-            "-Xdump-declarations-to=${buildDir}/stdlib-jre8-declarations.json",
+            "-Xdump-declarations-to", "${buildDir}/stdlib-jre8-declarations.json",
             "-module-name", project.name
     ]
 }
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle
index d164a26f105..72439c015bd 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle
+++ b/libraries/tools/binary-compatibility-validator/build.gradle
@@ -17,7 +17,7 @@ sourceSets {
 
 compileTestKotlin {
     kotlinOptions {
-        freeCompilerArgs = ["-Xdump-declarations-to=${buildDir}/cases-declarations.json"]
+        freeCompilerArgs = ['-Xdump-declarations-to', "${buildDir}/cases-declarations.json"]
     }
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImplTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImplTest.kt
index 8aca1077d0f..5c83988a4d9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImplTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImplTest.kt
@@ -12,7 +12,7 @@ class KotlinJvmOptionsTest {
                 "-Xreport-perf",
                 "-Xallow-kotlin-package",
                 "-Xmultifile-parts-inherit",
-                "-Xdump-declarations-to=declarationsPath",
+                "-Xdump-declarations-to", "declarationsPath",
                 "-script-templates", "a,b,c")
 
         val arguments = K2JVMCompilerArguments()
diff --git a/libraries/tools/kotlin-reflect/build.gradle b/libraries/tools/kotlin-reflect/build.gradle
index 479a9036c65..0afaf8ac767 100644
--- a/libraries/tools/kotlin-reflect/build.gradle
+++ b/libraries/tools/kotlin-reflect/build.gradle
@@ -74,7 +74,7 @@ compileKotlin {
         freeCompilerArgs = ["-version",
                             "-Xallow-kotlin-package",
                             "-module-name", "kotlin-reflection",
-                            "-Xdump-declarations-to=${buildDir}/reflect-declarations.json"]
+                            "-Xdump-declarations-to", "${buildDir}/reflect-declarations.json"]
     }
 }
 
diff --git a/libraries/tools/runtime/build.gradle b/libraries/tools/runtime/build.gradle
index dcba03fd950..c59d62f61cb 100644
--- a/libraries/tools/runtime/build.gradle
+++ b/libraries/tools/runtime/build.gradle
@@ -43,7 +43,7 @@ compileKotlin {
     kotlinOptions {
         freeCompilerArgs = [
                 "-Xallow-kotlin-package",
-                "-Xdump-declarations-to=${buildDir}/runtime-declarations.json",
+                "-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
                 "-cp", "${rootDir}/../dist/builtins",
                 "-module-name", project.name
         ]