In particular, this allows us to split the “test” and “pkg” stages, without
increasing the execution time.

(manually cherry picked from commit ac59b220)