diff --git a/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
index 09744a515f6..ace54790b9c 100644
--- a/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+++ b/buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
@@ -50,6 +50,12 @@ abstract class KonanTest extends JavaExec {
         dependsOn(project.rootProject.tasks['dist'])
     }
 
+    @Override
+    void setJvmArgs(Iterable<?> arguments) {
+        super.setJvmArgs(arguments + "-Dkonan.home=${dist.canonicalPath}" +
+                "-Djava.library.path=${dist.canonicalPath}/konan/nativelib")
+    }
+
     @Override
     void exec() {
         // Perhaps later we will return this exec() back but for now rest of infrastructure expects
@@ -64,9 +70,7 @@ abstract class KonanTest extends JavaExec {
         try {
             main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt'
             classpath = project.configurations.cli_bc
-            jvmArgs =["-ea",
-                       "-Dkonan.home=${dist.canonicalPath}",
-                       "-Djava.library.path=${dist.canonicalPath}/konan/nativelib"]
+            enableAssertions = true
             args = ["-output", output,
                      *filesToCompile,
                      *moreArgs,