Fix sporadic dependency-load issue in spec support files