Apply same fixes as in beat.core!38

3 jobs for new-test-strategy in 19 minutes and 49 seconds (queued for 4 seconds)