Cherry-picked 29aa8874

David Cameronrequested to merge
issue/drupal-3614964:3614964-olivero-tests-11 into 11.x

Closes #3614964

Merge request reports