CE Backport - Fix order-dependent spec failure by avoiding monkeypatching

See merge request gitlab-org/gitlab-ce!15893

(cherry picked from commit 31fa9313)

acde0e3f Fix spec by avoiding monkeypatching