Resolve #3480294 "Fix test failures"

Thomas Seiberrequested to merge
issue/search_api-3480294:3480294-fix-test-failures into 8.x-1.x

Closes #3480294

Merge request reports