Cherry picks 'fix-qa-spec-tests' into 15.7 stable branch

What does this MR do?

Cherry-picks !6580 (merged) into 15-7-stable branch to fix pipeline failures

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

• Merge Request Title, and Description are up to date, accurate, and descriptive
• MR targeting the appropriate branch
• MR has a green pipeline on GitLab.com
• Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
• trigger-package has a green pipeline running against latest commit