Revert "Fix test when using threaded minion"

This reverts commit b9ccabdcab3a40441886da50440e7f8afe641b46.
Revert "Revert "Fix test when using threaded minion""

This reverts commit 9d20c48615e1fd59b3aa9a59d0f0d2e980e17bbf.