Should fix pip2 / make test issues

@luizirber @ctb