diff --git a/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php b/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
index abf94708c7..6c76a90278 100644
--- a/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
@@ -108,7 +108,7 @@ public function testBlockContentTypeEditing() {
     // Verify that title and body fields are displayed.
     $this->drupalGet('block/add/basic');
     $this->assertRaw('Block description', 'Block info field was found.');
-    $this->assertRaw('Body', 'Body field was found.');
+    $this->assertNotEmpty($this->cssSelect('#edit-body-0-value'), 'Body field was found.');
 
     // Change the block type name.
     $edit = [
@@ -137,7 +137,7 @@ public function testBlockContentTypeEditing() {
     $this->drupalPostForm('admin/structure/block/block-content/manage/basic', [], t('Save'));
     // Check that the body field doesn't exist.
     $this->drupalGet('block/add/basic');
-    $this->assertFalse($this->cssSelect('tr#block-body'), 'Body field was not found.');
+    $this->assertEmpty($this->cssSelect('#edit-body-0-value'), 'Body field was not found.');
   }
 
   /**