diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/generate/GroovyGenerateMembersTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/generate/GroovyGenerateMembersTest.groovy
index 25a2bab0634c..551597fb85ae 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/generate/GroovyGenerateMembersTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/generate/GroovyGenerateMembersTest.groovy
@@ -59,12 +59,12 @@ class Foo extends Super {
   Object d
   final e
 
-  Foo(a, int b, int c, Object d, e) {
-    super(a, b)
-    this.c = c
-    this.d = d
-    this.e = e
-  }
+    Foo(a, int b, int c, Object d, e) {
+        super(a, b)
+        this.c = c
+        this.d = d
+        this.e = e
+    }
 }
 """
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy
index 94c1217b45bc..e24741b92655 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy
@@ -23,10 +23,10 @@ class Test {<caret>}
     generateImplementation(findMethod(Object.name, "equals"))
     myFixture.checkResult """
 class Test {
-  @Override
-  boolean equals(Object obj) {
-    return super.equals(obj)    //To change body of overridden methods use File | Settings | File Templates.
-  }
+    @Override
+    boolean equals(Object obj) {
+        return super.equals(obj)    //To change body of overridden methods use File | Settings | File Templates.
+    }
 }
 """
   }
@@ -38,9 +38,9 @@ class Test {<caret>}
     generateImplementation(findMethod(Object.name, "Object"))
     myFixture.checkResult """
 class Test {
-  def Test() {
-    super()    //To change body of overridden methods use File | Settings | File Templates.
-  }
+    def Test() {
+        super()    //To change body of overridden methods use File | Settings | File Templates.
+    }
 }
 """
   }
@@ -59,9 +59,9 @@ class Test {<caret>}
     generateImplementation(findMethod("Foo", "foo"))
     myFixture.checkResult """
 class Test {
-  @Override def foo() {
-    return super.foo()    //To change body of overridden methods use File | Settings | File Templates.
-  }
+    @Override def foo() {
+        return super.foo()    //To change body of overridden methods use File | Settings | File Templates.
+    }
 }
 """
   }
@@ -78,9 +78,9 @@ class Test<T> extends Base<T> {<caret>}
     generateImplementation(findMethod("Base", "toArray"))
     myFixture.checkResult """
 class Test<T> extends Base<T> {
-  @Override def <T> T[] toArray(T[] t) {
-    return super.toArray(t)    //To change body of overridden methods use File | Settings | File Templates.
-  }
+    @Override def <T> T[] toArray(T[] t) {
+        return super.toArray(t)    //To change body of overridden methods use File | Settings | File Templates.
+    }
 }
 """
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
index f95641c24e28..28c11ebb7e72 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
@@ -158,11 +158,11 @@ class A {
 
     String ndame;
     void foo() {
-      print name
+        print name
 
-      print getName()
+        print getName()
 
-      setName("a")
+        setName("a")
     }
   }
 }""")
@@ -177,11 +177,11 @@ class A {
 
     String ndame;
     void foo() {
-      print A.this.ndame
+        print A.this.ndame
 
-      print A.this.getNdame()
+        print A.this.getNdame()
 
-      A.this.setNdame("a")
+        A.this.setNdame("a")
     }
   }
 }"""
diff --git a/plugins/groovy/testdata/groovy/refactoring/rename/closureIt.test b/plugins/groovy/testdata/groovy/refactoring/rename/closureIt.test
index 5da844e827d9..57e8186a0eaf 100644
--- a/plugins/groovy/testdata/groovy/refactoring/rename/closureIt.test
+++ b/plugins/groovy/testdata/groovy/refactoring/rename/closureIt.test
@@ -3,6 +3,6 @@ def c = {
 }
 -----
 def c = {
-  def newName ->
-  newName
+    def newName ->
+    newName
 }
\ No newline at end of file
diff --git a/plugins/groovy/testdata/refactoring/introduceConstant/EscalateVisibility_after.groovy b/plugins/groovy/testdata/refactoring/introduceConstant/EscalateVisibility_after.groovy
index ea76fc0c83f4..858b68e11224 100644
--- a/plugins/groovy/testdata/refactoring/introduceConstant/EscalateVisibility_after.groovy
+++ b/plugins/groovy/testdata/refactoring/introduceConstant/EscalateVisibility_after.groovy
@@ -1,6 +1,6 @@
-<caret>class A {
+class A {
   def foo() {
-    print Other.CONST
+    print Other.<selection>CONST</selection>
   }
 }
 
diff --git a/plugins/groovy/testdata/refactoring/introduceConstant/InsertInEnum_after.groovy b/plugins/groovy/testdata/refactoring/introduceConstant/InsertInEnum_after.groovy
index 50a6e3f5c0d1..3b7eb7ef2ed8 100644
--- a/plugins/groovy/testdata/refactoring/introduceConstant/InsertInEnum_after.groovy
+++ b/plugins/groovy/testdata/refactoring/introduceConstant/InsertInEnum_after.groovy
@@ -1,4 +1,4 @@
-<caret>enum Planet {
+enum Planet {
   MERCURY(3.303e+23, 2.4397e6),
   VENUS(4.869e+24, 6.0518e6),
     protected static final CONST = 6.67300E-11
@@ -12,6 +12,6 @@
 
   double surfaceGravity() {
 //      introduce a constant from the below numeric literal
-    return CONST * mass / (radius * radius);
+    return <selection>CONST</selection> * mass / (radius * radius);
   }
 }
\ No newline at end of file
diff --git a/plugins/groovy/testdata/refactoring/introduceConstant/InsertInInterface_after.groovy b/plugins/groovy/testdata/refactoring/introduceConstant/InsertInInterface_after.groovy
index d77a66335dd1..5a74101f7615 100644
--- a/plugins/groovy/testdata/refactoring/introduceConstant/InsertInInterface_after.groovy
+++ b/plugins/groovy/testdata/refactoring/introduceConstant/InsertInInterface_after.groovy
@@ -1,7 +1,7 @@
-<caret>interface MyInterface {
+interface MyInterface {
     protected CONST = 45 + 6
 
     def foo(String s);
 }
 
-def a = MyInterface.CONST;
\ No newline at end of file
+def a = MyInterface.<selection>CONST</selection>;
\ No newline at end of file
diff --git a/plugins/groovy/testdata/refactoring/introduceConstant/ReplaceAllOccurences_after.groovy b/plugins/groovy/testdata/refactoring/introduceConstant/ReplaceAllOccurences_after.groovy
index 1db78547c92e..396c25693385 100644
--- a/plugins/groovy/testdata/refactoring/introduceConstant/ReplaceAllOccurences_after.groovy
+++ b/plugins/groovy/testdata/refactoring/introduceConstant/ReplaceAllOccurences_after.groovy
@@ -1,8 +1,8 @@
-<caret>class A {
+class A {
     public static final String CONST = "a"
 
     def foo() {
-    print CONST
+    print <selection>CONST</selection>
   }
 
   def bar() {
diff --git a/plugins/groovy/testdata/refactoring/introduceConstant/Simple_after.groovy b/plugins/groovy/testdata/refactoring/introduceConstant/Simple_after.groovy
index 787e1d2b9132..c30f9753025a 100644
--- a/plugins/groovy/testdata/refactoring/introduceConstant/Simple_after.groovy
+++ b/plugins/groovy/testdata/refactoring/introduceConstant/Simple_after.groovy
@@ -1,7 +1,7 @@
-<caret>class Foo {
+class Foo {
     public static final String CONST = "text"
 
     def foo() {
-    print CONST;
+    print <selection>CONST</selection>;
   }
 }
\ No newline at end of file