diff --git a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
index efb06c4..b4c8d38 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
@@ -237,10 +237,8 @@ public function testSetErrorByName($limit_validation_errors, $expected_errors, $
       ->getMock();
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs(array($request_stack, $this->getStringTranslationStub(), $csrf_token))
-      ->setMethods(array('drupalSetMessage'))
+      ->setMethods(NULL)
       ->getMock();
-    $form_validator->expects($set_message ? $this->once() : $this->never())
-      ->method('drupalSetMessage');
 
     $form_state = $this->getFormStateDefaults();
     $form_state['limit_validation_errors'] = $limit_validation_errors;
@@ -276,7 +274,7 @@ public function testSetElementErrorsFromFormState() {
       ->getMock();
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs(array($request_stack, $this->getStringTranslationStub(), $csrf_token))
-      ->setMethods(array('drupalSetMessage'))
+      ->setMethods(NULL)
       ->getMock();
 
     $form = array(