diff --git a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
index 1580d9c..642d87b 100644
--- a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
+++ b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
@@ -188,11 +188,11 @@ public function testModuleBreakpoints() {
    */
   public function testBreakpointGroups() {
     $expected = array(
+      'breakpoint.all' => 'All Viewports',
       'bartik' => 'Bartik',
       'breakpoint_module_test' => 'Breakpoint test module',
       'breakpoint_theme_test' => 'Breakpoint test theme',
       'breakpoint_theme_test.group2' => 'breakpoint_theme_test.group2',
-      'breakpoint.all' => 'All Viewports',
     );
     $breakpoint_groups = \Drupal::service('breakpoint.manager')->getGroups();
     // Ensure the order is as expected. Should be sorted by label.
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
index a3e2213..1218158 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
@@ -38,13 +38,18 @@ protected function setUp() {
    * Test responsive image administration functionality.
    */
   public function testResponsiveImageAdmin() {
-    // We start without any default styles.
+    // We start with two default styles.
     $this->drupalGet('admin/config/media/responsive-image-style');
-    $this->assertText('There is no Responsive image style yet.');
+    $this->assertNoText('There is no Responsive image style yet.');
+    $this->assertText('Narrow');
+    $this->assertText('narrow');
+    $this->assertText('Wide');
+    $this->assertText('wide');
 
-    // Add a new responsive image style, our breakpoint set should be selected.
+    // Add a new responsive image style, the all viewports breakpoint set should
+    // be selected.
     $this->drupalGet('admin/config/media/responsive-image-style/add');
-    $this->assertFieldByName('breakpoint_group', 'responsive_image_test_module');
+    $this->assertFieldByName('breakpoint_group', 'All Viewports');
 
     // Create a new group.
     $edit = array(
@@ -110,7 +115,9 @@ public function testResponsiveImageAdmin() {
     $this->drupalGet('admin/config/media/responsive-image-style/style_one/delete');
     $this->drupalPostForm(NULL, array(), t('Delete'));
     $this->drupalGet('admin/config/media/responsive-image-style');
-    $this->assertText('There is no Responsive image style yet.');
+    $this->assertNoText('Style One');
+    // Default responsive image styles should remain.
+    $this->assertNoText('There is no Responsive image style yet.');
   }
 
 }