diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index f15a81fe5ef1..399f3ccadd74 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -306,7 +306,7 @@
                  description="Whether to skip substitutor computation if return type doesn't depend on it"/>
     <registryKey key="groovy.assert.element.kind.in.resolve" defaultValue="true"
                  description="Whether to throw error if the element is unexpected in resolve processor"/>
-    <registryKey key="groovy.collect.method.calls.for.inference" defaultValue="false"
+    <registryKey key="groovy.collect.method.calls.for.inference" defaultValue="true"
                  description="Allows to collect method usages for more precise type inference"/>
 
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityClosureToSamTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityClosureToSamTest.groovy
index 6c2a8b456769..3d20cf7e4dd6 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityClosureToSamTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityClosureToSamTest.groovy
@@ -33,8 +33,8 @@ B <warning>b</warning> = {print 2}
 interface SAM1 { def foo(String s)}
 interface SAM2 { def bar(Integer i)}
 
-def method(x, SAM1 s1){s1.foo<weak_warning>(x)</weak_warning>}
-def method(x, SAM2 s2){s2.bar<weak_warning>(x)</weak_warning>}
+def method(x, SAM1 s1){s1.foo(x)}
+def method(x, SAM2 s2){s2.bar(x)}
 
 method <warning>(1)</warning>   {it}  // fails because SAM1 and SAM2 are seen as equal
 method <warning>("1")</warning> {it}  // fails because SAM1 and SAM2 are seen as equal
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
index 48e4b9cb1d6e..0f1a4ed030f1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
@@ -189,7 +189,7 @@ def foo1(Object a) { }
 def bar1(def b) { foo1(b) }
 
 def foo2(String a) { }
-def bar2(def b) { foo2<weak_warning descr="Cannot infer argument types">(b)</weak_warning> }
+def bar2(def b) { foo2(b) }
 ''')
   }
 
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/concurency.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/concurency.java
index 29dfcff746d8..a1763e292942 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/concurency.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/concurency.java
@@ -41,7 +41,7 @@ return null;
 }
 
 public synchronized void out(groovy.lang.GString message) {
-invokeMethod("println", new java.lang.Object[]{message});
+println(message);
 }
 
 public concurency(groovy.lang.Binding binding) {