diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 0a24a9d..912e9b9 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -859,8 +859,8 @@ function file_save_upload($form_field_name, $validators = array(), $destination
           '#items' => $errors,
         ),
       );
-      // @todo Add support render_arrays for drupal_set_message. See
-      //  https://www.drupal.org/node/2505497
+      // @todo Add support render arrays for drupal_set_message(). See
+      //  https://www.drupal.org/node/2505497.
       drupal_set_message(\Drupal::service('renderer')->render($message), 'error');
       $files[$i] = FALSE;
       continue;
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index 97da8e6..9dea3f5 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -298,8 +298,8 @@ public function testDefaultImages() {
 
     $non_image = $this->drupalGetTestFiles('text');
     $this->drupalPostForm(NULL, array('files[settings_default_image_uuid]' => drupal_realpath($non_image[0]->uri)), t("Upload"));
-    $this->assertText('The specified file text-0.txt could not be uploaded.', 'Non-image file cannot be used as default image.');
-    $this->assertText('Only files with the following extensions are allowed: png gif jpg jpeg.', 'Non-image file cannot be used as default image.');
+    $this->assertText('The specified file text-0.txt could not be uploaded.');
+    $this->assertText('Only files with the following extensions are allowed: png gif jpg jpeg.');
 
     // Confirm the default image is shown on the node form.
     $file = File::load($default_images['field_new']->id());
diff --git a/core/modules/image/src/Tests/ImageFieldValidateTest.php b/core/modules/image/src/Tests/ImageFieldValidateTest.php
index e1bb4d7..3822df6 100644
--- a/core/modules/image/src/Tests/ImageFieldValidateTest.php
+++ b/core/modules/image/src/Tests/ImageFieldValidateTest.php
@@ -45,10 +45,10 @@ function testResolution() {
       }
     }
     $this->uploadNodeImage($image_that_is_too_small, $field_name, 'article');
-    $this->assertRaw(t('The specified file %name could not be uploaded.', array('%name' => $image_that_is_too_small->filename)), 'Node save failed when minimum image resolution was not met.');
-    $this->assertRaw(t('The image is too small; the minimum dimensions are %dimensions pixels.', array('%dimensions' => '50x50')), 'Node save failed when minimum image resolution was not met.');
+    $this->assertRaw(t('The specified file %name could not be uploaded.', array('%name' => $image_that_is_too_small->filename)));
+    $this->assertRaw(t('The image is too small; the minimum dimensions are %dimensions pixels.', array('%dimensions' => '50x50')));
     $this->uploadNodeImage($image_that_is_too_big, $field_name, 'article');
-    $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'), 'Image exceeding max resolution was properly resized.');
+    $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'));
   }
 
   /**