diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
index 09ba856..7f03045 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -126,22 +126,14 @@ function testSearchResultsComment() {
     $edit_comment['comment_body[0][format]'] = $full_html_format_id;
     $this->drupalPostForm('comment/reply/node/' . $node->id() .'/comment', $edit_comment, t('Save'));
 
-    // Post a comment with an evil script tag nearby the keyword using
-    // 'FULL HTML' text format.
+    // Post a comment with an evil script using 'FULL HTML' text format.
     $edit_comment2 = array();
     $edit_comment2['subject[0][value]'] = "<script>alert('hello');</script>";
-    $edit_comment2['comment_body[0][value]'] = "goodbye<script>alert('candy');</script>";
+    $edit_comment2['comment_body[0][value]'] = "goodbye<script>alert('goodbye');</script>";
+    $full_html_format_id = 'full_html';
     $edit_comment2['comment_body[0][format]'] = $full_html_format_id;
     $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $edit_comment2, t('Save'));
 
-    // Post a comment with a keyword inside  an evil script tag using
-    // 'FULL HTML' text format.
-    $edit_comment3 = array();
-    $edit_comment3['subject[0][value]'] = "<script>alert('stars');</script>";
-    $edit_comment3['comment_body[0][value]'] = "<script>alert('rainbow');</script>";
-    $edit_comment3['comment_body[0][format]'] = $full_html_format_id;
-    $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $edit_comment3, t('Save'));
-
     // Invoke search index update.
     $this->drupalLogout();
     $this->cronRun();
@@ -174,28 +166,19 @@ function testSearchResultsComment() {
     );
     // Verify the evil comment subject is escaped in search results.
     $this->drupalPostForm('search/node', $edit, t('Search'));
-    $this->assertRaw('&lt;script&gt;alert(&#039;<strong>hello</strong>&#039;);');
-    $this->assertNoRaw('<script>');
-
-    // Search for the keyword near evil script comment body.
-    $edit = [
-      'keys' => 'goodbye',
-    ];
-    // Verify that nearby script tag in evil comment body is stripped from
-    // search results.
-    $this->drupalPostForm('search/node', $edit, t('Search'));
-    $this->assertRaw('<strong>goodbye</strong>');
+    $this->assertRaw('alert(&#039;<strong>hello</strong>&#039;);');
     $this->assertNoRaw('<script>');
 
     // Search for the evil script comment body.
-    $edit = [
-      'keys' => 'rainbow',
-    ];
-    // Verify contents inside script tag in evil comment body is stripped from
-    // search results.
+    $edit = array(
+      'keys' => "goodbye",
+    );
+    // Verify the evil comment body is escaped in search results.
     $this->drupalPostForm('search/node', $edit, t('Search'));
-    // Search for content inside script tag should return no result.
-    $this->assertText('Your search yielded no results.');
+    // Only one goodbye, the other one should be filtered out in the script tag.
+    $this->assertRaw('alert(&#039;<strong>goodbye</strong>&#039;);');
+    $this->assertNoRaw('<script>');
+    $this->assertUniqueText('goodbye');
 
     // Hide comments.
     $this->drupalLogin($this->adminUser);