Tweak at how solo-builds (Jenkins) resolve engine + engine-tests