Resolve #3618355 "Fix tests on"

Alex Pottrequested to merge
issue/entity_print-3618355:3618355-fix-tests-on into 8.x-2.x

Closes #3618355

Merge request reports