diff --git a/eval4j/build.gradle.kts b/eval4j/build.gradle.kts
index 996a129bdc5..99e10e4fbd1 100644
--- a/eval4j/build.gradle.kts
+++ b/eval4j/build.gradle.kts
@@ -2,15 +2,26 @@ apply { plugin("kotlin") }
 
 dependencies {
     val compile by configurations
+    val testCompile by configurations
     compile(project(":kotlin-stdlib"))
     compile(project(":kotlin-reflect"))
     compile(project(":compiler:backend"))
     compile(ideaSdkDeps("asm-all"))
 //    compile(files(PathUtil.getJdkClassesRootsFromCurrentJre())) // TODO: make this one work instead of the nex one, since it contains more universal logic
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
     buildVersion()
 }
 
 configureKotlinProjectSourcesDefault()
-configureKotlinProjectNoTests()
+configureKotlinProjectTestsDefault()
 
+tasks.withType<Test> {
+    dependsOnTaskIfExistsRec("dist", project = rootProject)
+    jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1200m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true")
+    maxHeapSize = "1200m"
+    workingDir = rootDir
+    systemProperty("idea.is.unit.test", "true")
+    environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
+    ignoreFailures = true
+}
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 91b8207b13c..875b878f8c5 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -112,12 +112,9 @@ configure<JavaPluginConvention> {
         }
     }
 }
-configureKotlinProjectTests("idea/tests",
-                            "idea/idea-maven/test",
-                            "idea/idea-completion/tests",
-                            "j2k/tests",
-                            "eval4j/test",
-                            sourcesBaseDir = rootDir)
+configureKotlinProjectTests("tests",
+                            "idea-maven/test",
+                            "idea-completion/tests")
 
 tasks.withType<Test> {
     dependsOnTaskIfExistsRec("dist", project = rootProject)
@@ -126,14 +123,6 @@ tasks.withType<Test> {
     workingDir = rootDir
     systemProperty("idea.is.unit.test", "true")
     environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
-//    forkEvery = 100
-    testLogging {
-//        events = setOf(TestLogEvent.FAILED)
-//        showStackTraces = true
-//        showCauses = true
-//        exceptionFormat = TestExceptionFormat.FULL
-//        showStandardStreams = false
-    }
     ignoreFailures = true
 }
 
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index 3010fca4889..0d1dc2972c4 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -3,15 +3,54 @@ apply { plugin("kotlin") }
 
 dependencies {
     val compile by configurations
+    val testCompile by configurations
+    val testRuntime by configurations
     compile(project(":kotlin-stdlib"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:light-classes"))
     compile(project(":compiler:util"))
-    compile(ideaSdkCoreDeps("intellij-core", "util"))
+//    compile(ideaSdkCoreDeps("intellij-core", "util"))
+    testCompile(project(":idea"))
+    testCompile(project(":idea:idea-test-framework"))
+    testCompile(project(":compiler:light-classes"))
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(project(":compiler.tests-common"))
+//    testRuntime(project(":idea:idea-android"))
+//    testRuntime(project(":plugins:android-extensions-idea"))
+//    testRuntime(project(":plugins:sam-with-receiver-ide"))
+//    testRuntime(project(":plugins:allopen-ide"))
+//    testRuntime(project(":plugins:noarg-ide"))
+    testRuntime(ideaSdkDeps("*.jar"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "testng"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "properties"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "Groovy"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "coverage"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "maven"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "IntelliLang"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "testng"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "copyright"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "properties"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "java-i18n"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "coverage"))
+//    testRuntime(ideaPluginDeps("*.jar", plugin = "java-decompiler"))
+//    testRuntime(preloadedDeps("uast-common", "uast-java"))
     buildVersion()
 }
 
 configureKotlinProjectSourcesDefault()
-configureKotlinProjectNoTests()
+configureKotlinProjectTestsDefault()
 
+tasks.withType<Test> {
+    dependsOnTaskIfExistsRec("dist", project = rootProject)
+    jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1200m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true")
+    maxHeapSize = "1200m"
+    workingDir = rootDir
+    systemProperty("idea.is.unit.test", "true")
+    environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
+    ignoreFailures = true
+}