diff --git a/core/modules/image/src/Controller/ImageStyleDownloadController.php b/core/modules/image/src/Controller/ImageStyleDownloadController.php
index e668313..0a9b0f4 100644
--- a/core/modules/image/src/Controller/ImageStyleDownloadController.php
+++ b/core/modules/image/src/Controller/ImageStyleDownloadController.php
@@ -122,7 +122,6 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st
 
         if ($response instanceof BinaryFileResponse) {
           $response->headers->add([
-            'Cache-Control' => 'private',
             'Expires' => \DateTime::createFromFormat('j-M-Y H:i:s T', '19-Nov-1978 05:00:00 GMT')->format('D, d M Y H:i:s T'),
           ]);
         }
@@ -180,7 +179,6 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st
       $headers += array(
         'Content-Type' => $image->getMimeType(),
         'Content-Length' => $image->getFileSize(),
-        'Cache-Control' => 'private',
         'Expires' => \DateTime::createFromFormat('j-M-Y H:i:s T', '19-Nov-1978 05:00:00 GMT')->format('D, d M Y H:i:s T'),
       );
       return new BinaryFileResponse($uri, 200, $headers, FALSE);
diff --git a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
index 1548791..47efc0f 100644
--- a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
@@ -148,7 +148,8 @@ function testShortcutSetSwitchCreate() {
   function testShortcutSetSwitchNoSetName() {
     $edit = array('set' => 'new');
     $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', $edit, t('Change set'));
-    $this->assertRaw('1 error has been found: <a href="#edit-label">Label</a>');
+    $this->assertRaw('1 error has been found:');
+    $this->assertRaw('<a href="#edit-label">Label</a>');
     $current_set = shortcut_current_displayed_set($this->adminUser);
     $this->assertEqual($current_set->id(), $this->set->id(), 'Attempting to switch to a new shortcut set without providing a set name does not succeed.');
     $this->assertFieldByXPath("//input[@name='label' and contains(concat(' ', normalize-space(@class), ' '), ' error ')]", NULL, 'The new set label field has the error class');