Revert "backport test improvements from develop"
Revert "backport test improvements from develop"

This reverts commit 0af7653dfa3fc9b30601dec2c8ac2ce3cba52e7f.

I guess that was way too optimistic.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt