Use the same invocation in tox.
Update travis config to use new tests.