diff --git a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle
index 97fbc5957bd..b1fb9d89848 100644
--- a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle
+++ b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle
@@ -29,14 +29,11 @@ android {
         minSdkVersion 7
         targetSdkVersion 16
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 // VERSION: $VERSION$
diff --git a/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle
index 583c6c0d573..9182798fcff 100644
--- a/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle
+++ b/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle
@@ -23,12 +23,9 @@ android {
         minSdkVersion 7
         targetSdkVersion 16
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
diff --git a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle b/idea/testData/configuration/android-gradle/buildConfigs_after.gradle
index 59292632fcf..7fd78842ec2 100644
--- a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle
+++ b/idea/testData/configuration/android-gradle/buildConfigs_after.gradle
@@ -29,13 +29,10 @@ android {
             buildConfig "public final static boolean IS_LIVE=false;"
         }
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle b/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle
index 4516b49a781..6a4382d4aa9 100644
--- a/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle
+++ b/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle
@@ -15,11 +15,8 @@ repositories {
 }
 
 android {
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
diff --git a/idea/testData/configuration/android-gradle/emptyFile_after.gradle b/idea/testData/configuration/android-gradle/emptyFile_after.gradle
index b53d17b022c..6cefa1cc8e8 100644
--- a/idea/testData/configuration/android-gradle/emptyFile_after.gradle
+++ b/idea/testData/configuration/android-gradle/emptyFile_after.gradle
@@ -12,10 +12,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-}
-android {
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle
index d95961eb3df..e81683abdd0 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle
@@ -10,9 +10,6 @@ android {
 
     deviceProvider project.ext.fakeProvider
     testServer project.ext.fakeServer
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 project.afterEvaluate {
@@ -37,7 +34,7 @@ project.afterEvaluate {
 
 dependencies {
     compile project(':lib')
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 buildscript {
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle
index 96d201cec6c..c45d035717f 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle
@@ -20,7 +20,7 @@ dependencies {
     debugCompile 'com.android.support:support-v13:13.0.0'
 
     compile 'com.google.android.gms:play-services:3.1.36'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 android {
@@ -61,7 +61,4 @@ android {
         noCompress 'txt'
         ignoreAssetsPattern "!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle
index 66980c93fb4..575ac2bdef3 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle
@@ -47,13 +47,10 @@ android {
             signingConfig signingConfigs.debug
         }
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle
index 0ec3d5d4cb3..1e20e22b2dd 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle
@@ -49,7 +49,6 @@ android {
         // tests/java, tests/res, tests/assets, ...
         // This is a *reset* so it replaces the default paths
         instrumentTest.setRoot('tests')
-        main.java.srcDirs += 'src/main/kotlin'
 
         // Could also be done with:
         //main.manifest.srcFile 'AndroidManifest.xml'
@@ -64,5 +63,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle
index bd294bd52a5..f3eed0ca325 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle
@@ -21,12 +21,11 @@ android {
                 srcDirs 'src/main/res1', 'src/main/res2'
             }
         }
-        main.java.srcDirs += 'src/main/kotlin'
     }
 }
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle
index 2ebe5f6feb9..293375ac3e9 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle
@@ -22,14 +22,11 @@ android {
     buildTypes.debug {
         zipAlign true
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 android.applicationVariants.each { variant ->
     variant.outputFile = file("$project.buildDir/${variant.name}.apk")
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle
index bc49740484e..7c73da66059 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle
@@ -4,9 +4,6 @@ apply plugin: 'kotlin-android'
 android {
     compileSdkVersion 15
     buildToolsVersion "17.0"
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 // query for all (non-test) variants and inject a new step in the builds
@@ -50,5 +47,5 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle
index 86f1c129bdb..a3d655f3978 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle
@@ -21,15 +21,12 @@ repositories {
 dependencies {
     compile 'com.example.android.multiproject:util:1.0'
     releaseCompile 'com.google.guava:guava:11.0.2'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 android {
     compileSdkVersion 15
     buildToolsVersion "17.0"
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 group = 'com.example.android.multiproject'
diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle
index 4c4dcf94d1e..640db3d6c98 100644
--- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle
+++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle
@@ -4,9 +4,6 @@ apply plugin: 'kotlin-android'
 android {
     compileSdkVersion 15
     buildToolsVersion "17.0"
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 //
@@ -14,7 +11,7 @@ android {
 //
 dependencies {
     compile project(':lib')
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 buildscript {
diff --git a/idea/testData/configuration/android-gradle/helloWorld_after.gradle b/idea/testData/configuration/android-gradle/helloWorld_after.gradle
index f25931da617..db18d41e9ac 100644
--- a/idea/testData/configuration/android-gradle/helloWorld_after.gradle
+++ b/idea/testData/configuration/android-gradle/helloWorld_after.gradle
@@ -14,13 +14,10 @@ apply plugin: 'kotlin-android'
 
 android {
     target = 'android-16'
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/libraryFile_after.gradle b/idea/testData/configuration/android-gradle/libraryFile_after.gradle
index 56dfa765b24..547b5cf74bc 100644
--- a/idea/testData/configuration/android-gradle/libraryFile_after.gradle
+++ b/idea/testData/configuration/android-gradle/libraryFile_after.gradle
@@ -35,12 +35,11 @@ android {
                 srcDir 'src'
             }
         }
-        main.java.srcDirs += 'src/main/kotlin'
     }
 }
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle b/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle
index da3fe266a98..b3d180d4a9e 100644
--- a/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle
+++ b/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle
@@ -22,12 +22,9 @@ android {
         minSdkVersion 7
         targetSdkVersion 16
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
diff --git a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle
index 3c199683919..7d54dfb9d47 100644
--- a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle
+++ b/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle
@@ -13,14 +13,11 @@ android {
         minSdkVersion 7
         targetSdkVersion 16
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'
diff --git a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle
index 671828e4290..a5e1fda10a4 100644
--- a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle
+++ b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle
@@ -28,14 +28,11 @@ android {
         minSdkVersion 7
         targetSdkVersion 16
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 
 dependencies {
     compile 'com.android.support:support-v4:13.0.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 // VERSION: $VERSION$
\ No newline at end of file
diff --git a/idea/testData/configuration/android-gradle/productFlavor_after.gradle b/idea/testData/configuration/android-gradle/productFlavor_after.gradle
index 5a71cc13548..c0e1831c8cc 100644
--- a/idea/testData/configuration/android-gradle/productFlavor_after.gradle
+++ b/idea/testData/configuration/android-gradle/productFlavor_after.gradle
@@ -22,13 +22,10 @@ android {
             packageName = 'com.example.android.gradle.productflavors.amazonappstore'
         }
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
 }
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
\ No newline at end of file