QA: Protect against bug 62030 happening again

Change-Id: Ibab4ca46ddb4893573898d8fb46949c258176920