Resolve circular dependencies on Travis?