diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index 35a5737..8792bae 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -120,3 +120,17 @@ function file_requirements($phase) {
 
   return $requirements;
 }
+
+/**
+ * Group by field usages.
+ */
+function file_update_8001() {
+  // core/modules/file/config/optional/views.view.files.yml was changed in
+  // https://www.drupal.org/node/2632372 to change group_by to true.
+  $config_factory = \Drupal::configFactory();
+  $view = $config_factory->getEditable('views.view.files');
+  $displays = $view->get('display');
+  $displays['page_2']['display_options']['group_by'] = 'true';
+  $view->set('display', $displays);
+  $view->save(TRUE);
+}
diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php
index 72b2378..dd75f51 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/src/Tests/FileListingTest.php
@@ -138,13 +138,17 @@ function testFileListingPages() {
       $this->assertText($node->getTitle(), 'Node title found on usage page.');
       $this->assertText('node', 'Registering entity type found on usage page.');
       $this->assertText('file', 'Registering module found on usage page.');
+      $counter = 0;
       foreach ($usage as $module) {
         foreach ($module as $entity_type) {
           foreach ($entity_type as $entity) {
+            $counter += $entity;
             $this->assertText($entity, 'Usage count found on usage page.');
           }
         }
       }
+      $xpath = $this->xpath('/html/body/div/main/div/div/div/div/div/table/tbody')[0];
+      $this->assertEqual(count($xpath->tr), $counter);
       $this->assertLinkByHref('node/' . $node->id(), 0, 'Link to registering entity found on usage page.');
     }
   }