diff --git a/core/modules/image/config/install/image.style.large.yml b/core/modules/image/config/install/image.style.large.yml
index 1f7c10c52b3bb0873c6df3f08a6f54db3b3c04d2..f9d17af9c643885cdcf977721f6c573581ed478c 100644
--- a/core/modules/image/config/install/image.style.large.yml
+++ b/core/modules/image/config/install/image.style.large.yml
@@ -6,7 +6,7 @@ effects:
     data:
       width: 480
       height: 480
-      upscale: true
+      upscale: false
     weight: 0
     uuid: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d
 langcode: en
diff --git a/core/modules/image/config/install/image.style.medium.yml b/core/modules/image/config/install/image.style.medium.yml
index 77e0d2a25c0a849b5b9ec2ed887f0e3c059d5eb6..f7fcb520e5c45e6e02927cfab8144cbd58b50501 100644
--- a/core/modules/image/config/install/image.style.medium.yml
+++ b/core/modules/image/config/install/image.style.medium.yml
@@ -6,7 +6,7 @@ effects:
     data:
       width: 220
       height: 220
-      upscale: true
+      upscale: false
     weight: 0
     uuid: bddf0d06-42f9-4c75-a700-a33cafa25ea0
 langcode: en
diff --git a/core/modules/image/config/install/image.style.thumbnail.yml b/core/modules/image/config/install/image.style.thumbnail.yml
index 22b5671f425361ad39ff6e4afb0adc5d3b1ebfb5..29ed87333a09fd39582b3588b30b8875ac027f9b 100644
--- a/core/modules/image/config/install/image.style.thumbnail.yml
+++ b/core/modules/image/config/install/image.style.thumbnail.yml
@@ -6,7 +6,7 @@ effects:
     data:
       width: 100
       height: 100
-      upscale: true
+      upscale: false
     weight: 0
     uuid: 1cfec298-8620-4749-b100-ccb6c4500779
 langcode: en
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index 24330bf7b0d08e245392a61613f149a0bbb37236..21b4789993abbf57690485bc8e9b3911251abc90 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -143,8 +143,8 @@ function _testImageFieldFormatters($scheme) {
     $image_style = array(
       '#theme' => 'image_style',
       '#uri' => $image_uri,
-      '#width' => 100,
-      '#height' => 50,
+      '#width' => 40,
+      '#height' => 20,
       '#style_name' => 'thumbnail',
     );
     $default_output = drupal_render($image_style);
@@ -199,8 +199,8 @@ function testImageFieldSettings() {
     $image_style = array(
       '#theme' => 'image_style',
       '#uri' => file_load($node->{$field_name}->target_id)->getFileUri(),
-      '#width' => 220,
-      '#height' => 110,
+      '#width' => 40,
+      '#height' => 20,
       '#style_name' => 'medium',
     );
     $default_output = drupal_render($image_style);
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index ffe6af398a77ddda50334da4f4629da89b507c40..44dab9b65273f030c30304d047dc6bfb2a1c409a 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -165,7 +165,7 @@ public function _testResponsiveImageFieldFormatters($scheme) {
     $fallback_image = array(
       '#theme' => 'responsive_image_source',
       '#src' => $large_style->buildUrl($image_uri),
-      '#dimensions' => array('width' => 480, 'height' => 240),
+      '#dimensions' => array('width' => 40, 'height' => 20),
     );
     $default_output = drupal_render($fallback_image);
     $this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');