Issue #3366478: Fix tests for 2.x

Merge request reports

Loading