diff --git a/plugins/groovy/testdata/groovy/codeStyle/method_decl2.test b/plugins/groovy/testdata/groovy/codeStyle/method_decl2.test
index 205b5d57fa17..f1ef0ce45138 100644
--- a/plugins/groovy/testdata/groovy/codeStyle/method_decl2.test
+++ b/plugins/groovy/testdata/groovy/codeStyle/method_decl2.test
@@ -1,5 +1,7 @@
 <option>METHOD_BRACE_STYLE=NEXT_LINE</option>
+<option>KEEP_SIMPLE_METHODS_IN_ONE_LINE=false</option>
 def foo()    {}
 -----
 def foo()
-{}
\ No newline at end of file
+{
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/codeStyle/try1.test b/plugins/groovy/testdata/groovy/codeStyle/try1.test
index a27631678668..6a67bdeb6256 100644
--- a/plugins/groovy/testdata/groovy/codeStyle/try1.test
+++ b/plugins/groovy/testdata/groovy/codeStyle/try1.test
@@ -1,10 +1,16 @@
 <option>BRACE_STYLE=NEXT_LINE</option>
 <option>FINALLY_ON_NEW_LINE=true</option>
 <option>CATCH_ON_NEW_LINE=false</option>
+<option>KEEP_SIMPLE_BLOCKS_IN_ONE_LINE=false</option>
 try {foo()} catch (E e) {} finally {bar()}
 -----
 try
-{ foo() } catch (E e)
-{}
+{
+  foo()
+} catch (E e)
+{
+}
 finally
-{ bar() }
\ No newline at end of file
+{
+  bar()
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/refactoring/move/moveMembers/doc/after/test.groovy b/plugins/groovy/testdata/refactoring/move/moveMembers/doc/after/test.groovy
index 7f78c186af9e..416d5998940e 100644
--- a/plugins/groovy/testdata/refactoring/move/moveMembers/doc/after/test.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveMembers/doc/after/test.groovy
@@ -1,6 +1,4 @@
 class A {
-
-
 }
 
 class B {
diff --git a/plugins/groovy/testdata/refactoring/move/moveMembers/fieldForwardRef/after/A.groovy b/plugins/groovy/testdata/refactoring/move/moveMembers/fieldForwardRef/after/A.groovy
index eb61624120f4..f7e8cc3b9037 100644
--- a/plugins/groovy/testdata/refactoring/move/moveMembers/fieldForwardRef/after/A.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveMembers/fieldForwardRef/after/A.groovy
@@ -1,3 +1,2 @@
 public class A {
-
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveMembers/scr40947/after/Test.groovy b/plugins/groovy/testdata/refactoring/move/moveMembers/scr40947/after/Test.groovy
index f93d83226b1d..d5038e8ac63b 100644
--- a/plugins/groovy/testdata/refactoring/move/moveMembers/scr40947/after/Test.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveMembers/scr40947/after/Test.groovy
@@ -1,5 +1,4 @@
 class A {
-
 }
 
 class Test {
diff --git a/plugins/groovy/testdata/refactoring/move/moveMembers/twoMethods/after/pack1/A.groovy b/plugins/groovy/testdata/refactoring/move/moveMembers/twoMethods/after/pack1/A.groovy
index 456406555158..46fc78fbbfbc 100644
--- a/plugins/groovy/testdata/refactoring/move/moveMembers/twoMethods/after/pack1/A.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveMembers/twoMethods/after/pack1/A.groovy
@@ -1,6 +1,4 @@
 package pack1;
 
 public class A {
-
-
 }
\ No newline at end of file