[Backport 2.x] Remove one unnecessary test and simply some code in a test

[Backport 2.x] Remove one unnecessary test and simply some code in a test #9868