Test suite: merge scenarios that test minor variations

The benefit of getting 100% independent results for these 2 scenarios
does not seem to outweigh the performance and resources cost:
the chances that only one of them fails are pretty low.