diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt
index aa1d163e2f9..fb61030e3d4 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt
@@ -37,10 +37,8 @@ class KotlinNonJvmGutterConfigurator : AbstractProjectResolverExtension() {
                             }
                             
                             project.afterEvaluate {
-                                project.tasks.each { Task task ->
-                                    if (kotlinTestClass.isAssignableFrom(task.class)) {
-                                        task.dependsOn('nonJvmTestIdeSupport')
-                                    }
+                                project.tasks.withType(kotlinTestClass) { Task task ->
+                                    task.dependsOn('nonJvmTestIdeSupport')
                                 }
                             }
                         }