Bug 14733: (QA followup) make tests independent of already defined branches