Bringing CircleCI in line with local