standardize retry options and behavior

I thought you wanted tox to work the other way around. Since tox is only a suggested build requirement for testify, I believe your suggestion - making tox call make test - is better. Can you remove this change from this PR and get the change in a new PR.