diff --git a/requirements-test.txt b/requirements-test.txt
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,4 +1,4 @@
-pytest<4
+pytest
 pytest-django
 swh.scheduler[testing]
 pytest-postgresql >= 2.1.0
diff --git a/tox.ini b/tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,22 @@
 [tox]
 envlist=flake8,mypy,py3
 
-[testenv:py3]
+[testenv]
+extras =
+  testing
 deps =
   # the dependency below is needed for now as a workaround for
   #   https://github.com/pypa/pip/issues/6239
   swh.core[http] >= 0.0.75
-  .[testing]
+  dev: ipdb
   pytest-cov
   pifpaf
 commands =
-  pifpaf run postgresql -- pytest --cov {envsitepackagesdir}/swh/deposit --cov-branch \
-      {envsitepackagesdir}/swh/deposit \
-      {posargs}
-
-[testenv:py3-dev]
-deps =
-  swh.core[http] >= 0.0.75
-  .[testing]
-  ipdb
-commands =
-  pytest {envsitepackagesdir}/swh/deposit/ {posargs}
+  pifpaf run postgresql -- \
+    pytest \
+  !dev: --cov {envsitepackagesdir}/swh/deposit --cov-branch \
+        {envsitepackagesdir}/swh/deposit \
+        {posargs}
 
 [testenv:flake8]
 skip_install = true
@@ -32,9 +28,9 @@
 
 [testenv:mypy]
 setenv = DJANGO_SETTINGS_MODULE = swh.deposit.settings.testing
-skip_install = true
+extras =
+  testing
 deps =
-  .[testing]
   mypy
 commands =
   mypy swh