Bug 20428: (QA follow-up) Remove redundant directory level