diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index 5daf04f8d25..a8f968bf037 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -25,4 +25,12 @@ classes.dependsOn.remove("compileJava")
 artifacts {
     archives sourcesJar
     archives javadocJar
+}
+
+compileKotlinCommon {
+    kotlinOptions {
+        freeCompilerArgs = [
+                "-module-name", project.name
+        ]
+    }
 }
\ No newline at end of file
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index fdac7679150..beb72910735 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -34,16 +34,13 @@ compileKotlinCommon {
 //    compilerJarFile = compilerJarWithBootstrapRuntime
 }
 
-/*
-// TODO: currently unsupported
 compileKotlinCommon {
     kotlinOptions {
         freeCompilerArgs = [
-                "-module-name", "${project.name}".toString()
+                "-module-name", project.name
         ]
     }
 }
-*/
 
 
 kotlin.experimental.coroutines 'enable'