diff --git a/tests/src/Kernel/BackendTestBase.php b/tests/src/Kernel/BackendTestBase.php
index adb91c9..f0cd848 100644
--- a/tests/src/Kernel/BackendTestBase.php
+++ b/tests/src/Kernel/BackendTestBase.php
@@ -836,6 +836,7 @@ protected function regressionTests2() {
     $this->regressionTest1916474();
     $this->regressionTest2284199();
     $this->regressionTest2471509();
+    $this->regressionTest2616804();
   }
 
   /**
@@ -933,7 +934,7 @@ protected function regressionTest2471509() {
    *
    * @see https://www.drupal.org/node/2616804
    */
-  protected function regressionTests2616804() {
+  protected function regressionTest2616804() {
     // The word has 28 Unicode characters but 56 bytes. Verify that it is still
     // indexed correctly.
     $mb_word = 'äöüßáŧæøðđŋħĸµäöüßáŧæøðđŋħĸµ';
@@ -945,9 +946,8 @@ protected function regressionTests2616804() {
       'type' => 'item',
       'body' => $mb_body,
     ));
-    $entity_count = count($this->entities);
     $count = $this->indexItems($this->indexId);
-    $this->assertEquals($entity_count, $count, 'Indexing an item with a word with 28 multi-byte characters worked.');
+    $this->assertEquals(1, $count, 'Indexing an item with a word with 28 multi-byte characters worked.');
 
     $query = $this->buildSearch($mb_word);
     $results = $query->execute();
@@ -963,7 +963,7 @@ protected function regressionTests2616804() {
     $index->getField('body')->setType('string');
     $index->save();
     $count = $index->indexItems();
-    $this->assertEquals($entity_count, $count, 'Switching type from text to string worked.');
+    $this->assertEquals(count($this->entities), $count, 'Switching type from text to string worked.');
 
     $query = $this->buildSearch(NULL, array("body,$mb_body"));
     $results = $query->execute();