diff --git a/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php b/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php
index 70f9503..4739298 100644
--- a/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php
+++ b/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php
@@ -27,7 +27,7 @@ protected function setUp() {
     parent::setUp();
     $this->bookUninstallValidator = $this->getMockBuilder('Drupal\book\BookUninstallValidator')
       ->disableOriginalConstructor()
-      ->setMethods(['hasOutlineBooks', 'hasBookNodes'])
+      ->setMethods(['hasBookOutlines', 'hasBookNodes'])
       ->getMock();
     $this->bookUninstallValidator->setStringTranslation($this->getStringTranslationStub());
   }
@@ -37,7 +37,7 @@ protected function setUp() {
    */
   public function testValidateNotBook() {
     $this->bookUninstallValidator->expects($this->never())
-      ->method('hasOutlineBooks');
+      ->method('hasBookOutlines');
     $this->bookUninstallValidator->expects($this->never())
       ->method('hasBookNodes');
 
@@ -52,7 +52,7 @@ public function testValidateNotBook() {
    */
   public function testValidateEntityQueryWithoutResults() {
     $this->bookUninstallValidator->expects($this->once())
-      ->method('hasOutlineBooks')
+      ->method('hasBookOutlines')
       ->willReturn(FALSE);
     $this->bookUninstallValidator->expects($this->once())
       ->method('hasBookNodes')
@@ -69,7 +69,7 @@ public function testValidateEntityQueryWithoutResults() {
    */
   public function testValidateEntityQueryWithResults() {
     $this->bookUninstallValidator->expects($this->once())
-      ->method('hasOutlineBooks')
+      ->method('hasBookOutlines')
       ->willReturn(FALSE);
     $this->bookUninstallValidator->expects($this->once())
       ->method('hasBookNodes')
@@ -86,7 +86,7 @@ public function testValidateEntityQueryWithResults() {
    */
   public function testValidateOutlineStorage() {
     $this->bookUninstallValidator->expects($this->once())
-      ->method('hasOutlineBooks')
+      ->method('hasBookOutlines')
       ->willReturn(TRUE);
     $this->bookUninstallValidator->expects($this->never())
       ->method('hasBookNodes');
diff --git a/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php
index 3d36366..16549c8 100644
--- a/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php
+++ b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php
@@ -127,7 +127,7 @@ public function testValidateHasTermsForVocabularyWithNodesAccess() {
     $module = 'forum';
     $expected = [
       'To uninstall Forum, first delete all <em>Forum</em> content.',
-      String::format('To uninstall Forum first delete all <a href="!url">%vocabulary</a> terms.', [
+      String::format('To uninstall Forum, first delete all <a href="!url">%vocabulary</a> terms.', [
         '!url' => '/path/to/vocabulary/overview',
         '%vocabulary' => 'Vocabulary label',
       ]),
@@ -164,7 +164,7 @@ public function testValidateHasTermsForVocabularyWithNodesNoAccess() {
     $module = 'forum';
     $expected = [
       'To uninstall Forum, first delete all <em>Forum</em> content.',
-      String::format('To uninstall Forum first delete all %vocabulary terms.', [
+      String::format('To uninstall Forum, first delete all %vocabulary terms.', [
         '%vocabulary' => 'Vocabulary label',
       ]),
     ];