Issue #2365737 follow-up: Fixing the test