diff --git a/idea/testData/wordSelection/DocComment/3.kt b/idea/testData/wordSelection/DocComment/3.kt
index c8344f7e538..442d16b056f 100644
--- a/idea/testData/wordSelection/DocComment/3.kt
+++ b/idea/testData/wordSelection/DocComment/3.kt
@@ -1,9 +1,9 @@
 package p
 
-<selection>/**
+/*<selection>*
  * Doc comment <caret>here
- */
-</selection>fun foo() {
+ </selection>*/
+fun foo() {
 }
 
 fun bar(){}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/DocComment/4.kt b/idea/testData/wordSelection/DocComment/4.kt
index 835877107c0..c8344f7e538 100644
--- a/idea/testData/wordSelection/DocComment/4.kt
+++ b/idea/testData/wordSelection/DocComment/4.kt
@@ -3,7 +3,7 @@ package p
 <selection>/**
  * Doc comment <caret>here
  */
-fun foo() {
+</selection>fun foo() {
 }
-</selection>
+
 fun bar(){}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/DocComment/5.kt b/idea/testData/wordSelection/DocComment/5.kt
new file mode 100644
index 00000000000..835877107c0
--- /dev/null
+++ b/idea/testData/wordSelection/DocComment/5.kt
@@ -0,0 +1,9 @@
+package p
+
+<selection>/**
+ * Doc comment <caret>here
+ */
+fun foo() {
+}
+</selection>
+fun bar(){}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/SimpleComment/2.kt b/idea/testData/wordSelection/SimpleComment/2.kt
index 5af97d14f0a..7260ad74fd8 100644
--- a/idea/testData/wordSelection/SimpleComment/2.kt
+++ b/idea/testData/wordSelection/SimpleComment/2.kt
@@ -1,6 +1,6 @@
 package p
 
-<selection>/* This is a <caret>comment */</selection>
+/*<selection> This is a <caret>comment </selection>*/
 fun foo() {
 }
 
diff --git a/idea/testData/wordSelection/SimpleComment/3.kt b/idea/testData/wordSelection/SimpleComment/3.kt
index 0cafcb0c4ad..5af97d14f0a 100644
--- a/idea/testData/wordSelection/SimpleComment/3.kt
+++ b/idea/testData/wordSelection/SimpleComment/3.kt
@@ -1,7 +1,7 @@
 package p
 
-<selection>/* This is a <caret>comment */
-</selection>fun foo() {
+<selection>/* This is a <caret>comment */</selection>
+fun foo() {
 }
 
 fun bar(){}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/SimpleComment/4.kt b/idea/testData/wordSelection/SimpleComment/4.kt
index f83c98f95fd..0cafcb0c4ad 100644
--- a/idea/testData/wordSelection/SimpleComment/4.kt
+++ b/idea/testData/wordSelection/SimpleComment/4.kt
@@ -1,7 +1,7 @@
 package p
 
 <selection>/* This is a <caret>comment */
-fun foo() {
+</selection>fun foo() {
 }
-</selection>
+
 fun bar(){}
\ No newline at end of file
diff --git a/idea/testData/wordSelection/SimpleComment/5.kt b/idea/testData/wordSelection/SimpleComment/5.kt
new file mode 100644
index 00000000000..f83c98f95fd
--- /dev/null
+++ b/idea/testData/wordSelection/SimpleComment/5.kt
@@ -0,0 +1,7 @@
+package p
+
+<selection>/* This is a <caret>comment */
+fun foo() {
+}
+</selection>
+fun bar(){}
\ No newline at end of file