stabilize smoke test runs

Son of Odinrequested to merge
stable-smoke into master

Noticed our smoke tests were a bit flaky giving false positive or false negative

Merge request reports