Merge pull request #2753 from reaperhulk/backport-tox-setup-changes

Backport tox setup changes + no hypothesis on 2.6