Merge pull request #385 from alex/consistent-tox

Make the PyPy tox job consistent with the main one.