1 files changed, 36 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 9518954..d1d97f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,9 @@
+[pytest]
+addopts = -s
+
 [tox]
 minversion = 2.4
-envlist = {py27,py35,py36,py37,py38,py,py3}-{plain,hiredis}, flake8
+envlist = {py27,py35,py36,py37,py38,pypy,pypy3}-{plain,hiredis}, flake8, covreport, codecov
 
 [testenv]
 deps =
@@ -9,7 +12,9 @@ deps =
     pytest >= 2.7.0
 extras =
     hiredis: hiredis
-commands = {envpython} -b -m coverage run -m pytest -W always {posargs}
+commands =
+    {envpython} -b -m coverage run -p -m pytest -W always {posargs}
+    {envpython} -b -m coverage combine --append
 
 [testenv:flake8]
 basepython = python3.6
@@ -17,3 +22,32 @@ deps = flake8
 commands = flake8
 skipsdist = true
 skip_install = true
+
+[testenv:pypy-plain]
+basepython = pypy
+
+[testenv:pypy-hiredis]
+basepython = pypy
+
+[testenv:pypy3-plain]
+basepython = pypy3
+
+[testenv:pypy3-hiredis]
+basepython = pypy3
+
+[testenv:codecov]
+deps = codecov
+commands = codecov
+passenv =
+  REDIS_*
+  CI
+  CI_*
+  CODECOV_*
+  SHIPPABLE
+  TRAVIS
+  TRAVIS_*
+  VCS_*
+
+[testenv:covreport]
+deps = coverage
+commands = coverage report