[1.6.x] Fixed #21041 -- Removed a duplicate form in tests.

Thanks tuxcanfly.

Backport of bab039d74c from master