diff --git a/java/java-tests/testData/codeInsight/selectWordAction/block1/after1.java b/java/java-tests/testData/codeInsight/selectWordAction/block1/after1.java
index f8562d9e647d..362c594924fa 100644
--- a/java/java-tests/testData/codeInsight/selectWordAction/block1/after1.java
+++ b/java/java-tests/testData/codeInsight/selectWordAction/block1/after1.java
@@ -1,7 +1,7 @@
 class C {
     private void foo() {
-        <selection>{
+        {
 <selection>             <caret></selection>
-        }</selection>
+        }
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/selectWordAction/block1/after2.java b/java/java-tests/testData/codeInsight/selectWordAction/block1/after2.java
index 43bb6e4358f0..5fa8327aaf4e 100644
--- a/java/java-tests/testData/codeInsight/selectWordAction/block1/after2.java
+++ b/java/java-tests/testData/codeInsight/selectWordAction/block1/after2.java
@@ -1,7 +1,7 @@
 class C {
     private void foo() {
-        {
- <selection>             <caret>
-</selection>        }
+        <selection>{
+             <caret>
+        }</selection>
     }
-}
\ No newline at end of file
+}
diff --git a/java/java-tests/testData/codeInsight/selectWordAction/block1/after3.java b/java/java-tests/testData/codeInsight/selectWordAction/block1/after3.java
index 20a6aa76ed1f..202c6f9afa35 100644
--- a/java/java-tests/testData/codeInsight/selectWordAction/block1/after3.java
+++ b/java/java-tests/testData/codeInsight/selectWordAction/block1/after3.java
@@ -1,7 +1,7 @@
 class C {
-    private void foo() <selection>{
-        <selection>{
+    private void foo() {
+<selection>        {
              <caret>
-        }</selection>
-    }</selection>
-}
\ No newline at end of file
+        }
+</selection>    }
+}
diff --git a/java/java-tests/testData/codeInsight/selectWordAction/block1/after4.java b/java/java-tests/testData/codeInsight/selectWordAction/block1/after4.java
index 802d6ce1f30e..58308f3ee252 100644
--- a/java/java-tests/testData/codeInsight/selectWordAction/block1/after4.java
+++ b/java/java-tests/testData/codeInsight/selectWordAction/block1/after4.java
@@ -1,7 +1,7 @@
 class C {
-    private void foo() {
-<selection>        {
+    private void foo() <selection>{
+        {
              <caret>
         }
-</selection>    }
-}
\ No newline at end of file
+    }</selection>
+}
diff --git a/java/java-tests/testData/codeInsight/selectWordAction/block1/after5.java b/java/java-tests/testData/codeInsight/selectWordAction/block1/after5.java
deleted file mode 100644
index 6a9a2adbd45e..000000000000
--- a/java/java-tests/testData/codeInsight/selectWordAction/block1/after5.java
+++ /dev/null
@@ -1,7 +0,0 @@
-class C {
-    private void foo() <selection>{
-        {
-             <caret>
-        }
-    }</selection>
-}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/selectWordAction/block2/after2.java b/java/java-tests/testData/codeInsight/selectWordAction/block2/after2.java
index be13d2258835..a49a7f3566ea 100644
--- a/java/java-tests/testData/codeInsight/selectWordAction/block2/after2.java
+++ b/java/java-tests/testData/codeInsight/selectWordAction/block2/after2.java
@@ -1,5 +1,5 @@
 class C {
     private void foo() {
-      if (a) <selection>{ <caret> }</selection>
+        if (a) <selection>{ <caret> }</selection>
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after1.java b/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after1.java
index 106fc08f8045..73266def2b22 100644
--- a/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after1.java
+++ b/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after1.java
@@ -1,5 +1,5 @@
 class C {
-<selection>    </selection>private void foo() {
+<selection><caret>    </selection>private void foo() {
         if (a) {
         }
     }
diff --git a/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after2.java b/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after2.java
index 210bdf4061ba..9ce181d0b946 100644
--- a/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after2.java
+++ b/java/java-tests/testData/codeInsight/selectWordAction/javaStartLine/after2.java
@@ -1,5 +1,5 @@
 class C {
-<selection>    private void foo() {
+<selection><caret>    private void foo() {
         if (a) {
         }
     }
diff --git a/plugins/kotlin/idea/tests/testData/wordSelection/Class/1.kt b/plugins/kotlin/idea/tests/testData/wordSelection/Class/1.kt
index 137138ff46b2..f44a1dc30540 100644
--- a/plugins/kotlin/idea/tests/testData/wordSelection/Class/1.kt
+++ b/plugins/kotlin/idea/tests/testData/wordSelection/Class/1.kt
@@ -1,3 +1,3 @@
-class SimpleClass <selection>{
-    <caret>
-}</selection>
\ No newline at end of file
+class SimpleClass {
+<selection>    <caret></selection>
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/wordSelection/Class/2.kt b/plugins/kotlin/idea/tests/testData/wordSelection/Class/2.kt
index a0e07bf61867..137138ff46b2 100644
--- a/plugins/kotlin/idea/tests/testData/wordSelection/Class/2.kt
+++ b/plugins/kotlin/idea/tests/testData/wordSelection/Class/2.kt
@@ -1,3 +1,3 @@
-<selection>class SimpleClass {
+class SimpleClass <selection>{
     <caret>
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/wordSelection/Class/3.kt b/plugins/kotlin/idea/tests/testData/wordSelection/Class/3.kt
new file mode 100644
index 000000000000..a0e07bf61867
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/wordSelection/Class/3.kt
@@ -0,0 +1,3 @@
+<selection>class SimpleClass {
+    <caret>
+}</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/1.kt b/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/1.kt
index 94a83bffc234..dbaec0d7abc2 100644
--- a/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/1.kt
+++ b/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/1.kt
@@ -2,10 +2,10 @@ class C {
     fun foo() {
     }
 
-<selection><caret>    /**
+<selection><caret>    </selection>/**
      * comment
      */
-</selection>    fun bar() {
+    fun bar() {
     }
 
     fun baz() {
diff --git a/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/2.kt b/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/2.kt
index e5aadf7b678c..94a83bffc234 100644
--- a/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/2.kt
+++ b/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/2.kt
@@ -5,9 +5,9 @@ class C {
 <selection><caret>    /**
      * comment
      */
-    fun bar() {
+</selection>    fun bar() {
     }
-</selection>
+
     fun baz() {
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/3.kt b/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/3.kt
new file mode 100644
index 000000000000..e5aadf7b678c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/wordSelection/DeclarationWithDocComment/3.kt
@@ -0,0 +1,13 @@
+class C {
+    fun foo() {
+    }
+
+<selection><caret>    /**
+     * comment
+     */
+    fun bar() {
+    }
+</selection>
+    fun baz() {
+    }
+}
\ No newline at end of file