Tweaks for Jenkins-based testing