Fix test permanently
What does this MR do and why?
Describe in detail what your merge request does and why.
We merged a bandaid for #349055 (closed) but this is intended to be a proper fix.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.