diff --git a/requirements-test-db.txt b/requirements-test-db.txt
new file mode 100644
--- /dev/null
+++ b/requirements-test-db.txt
@@ -0,0 +1 @@
+pytest-postgresql
diff --git a/requirements-test.txt b/requirements-test.txt
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,5 +1,4 @@
 pytest
-pytest-postgresql
 requests-mock
 hypothesis >= 3.11.0
 pre-commit
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -51,10 +51,14 @@
     install_requires=parse_requirements(None, 'swh'),
     setup_requires=['vcversioner'],
     extras_require={
-        'testing': parse_requirements('test', 'db', 'http', 'logging'),
+        'testing-core': parse_requirements('test'),
         'logging': parse_requirements('logging'),
         'db': parse_requirements('db'),
+        'testing-db': parse_requirements('test-db'),
         'http': parse_requirements('http'),
+        # kitchen sink, please do not use
+        'testing': parse_requirements('test', 'test-db', 'db', 'http',
+                                      'logging'),
     },
     vcversioner={},
     include_package_data=True,
diff --git a/tox.ini b/tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,9 @@
 
 [testenv]
 deps =
-  -rrequirements-test.txt
-  core: -rrequirements-logging.txt
-  db: .[db]
+  .[testing-core]
+  core: .[logging]
+  db: .[db,testing-db]
   db: pifpaf
   server: .[http]
   cover: pytest-cov
@@ -34,7 +34,7 @@
 [testenv:mypy]
 skip_install = true
 deps =
-  .[testing]
+  .[logging,db,http,testing-core,testing-db]
   mypy
 commands =
   mypy swh