WIP: squash "make travis faster"