bug 867421 - group tests by environment rather than domain