Followup #13779: Backwards-compatible unit test
(cherry picked from commit 12a101729086ec1f9b8b029cd66971c11959bc33)