diff --git a/debian/control b/debian/control
index 1e69d518a..ac9a79301 100644
--- a/debian/control
+++ b/debian/control
@@ -1,57 +1,57 @@
 Source: swh-storage
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-python,
+               dh-python (>= 2),
                python3-aiohttp,
                python3-all,
                python3-click,
                python3-dateutil,
                python3-flask,
                python3-nose,
                python3-psycopg2,
                python3-requests,
                python3-setuptools,
                python3-sqlalchemy,
                python3-swh.core (>= 0.0.28~),
                python3-swh.model (>= 0.0.18~),
                python3-swh.objstorage (>= 0.0.17~),
                python3-swh.scheduler (>= 0.0.14~),
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DSTO/
 
 Package: python3-swh.storage
 Architecture: all
 Depends: python3-swh.core (>= 0.0.28~),
          python3-swh.model (>= 0.0.18~),
          python3-swh.objstorage (>= 0.0.17~),
          ${misc:Depends},
          ${python3:Depends}
 Description: Software Heritage storage utilities
 
 Package: python3-swh.storage.listener
 Architecture: all
 Depends: python3-kafka (>= 1.3.1~),
          python3-swh.journal (>= 0.0.2~),
          python3-swh.storage (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends}
 Description: Software Heritage storage listener
 
 Package: python3-swh.storage.provenance
 Architecture: all
 Depends: python3-swh.scheduler (>= 0.0.14~),
          python3-swh.storage (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends}
 Description: Software Heritage storage Provenance
 
 Package: python3-swh.storage.schemata
 Architecture: all
 Depends: python3-sqlalchemy,
          python3-swh.storage (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends}
 Description: Ancillary schemata for Software Heritage
diff --git a/debian/rules b/debian/rules
index e3eddb52f..e913e4b77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,22 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=swh.storage
+export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs swh/storage
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 
 override_dh_install:
 	dh_install
 	for pyvers in $(shell py3versions -vr); do \
 		mkdir -p $(CURDIR)/debian/python3-swh.storage.listener/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 		mv $(CURDIR)/debian/python3-swh.storage/usr/lib/python$$pyvers/dist-packages/swh/storage/listener.py \
 		   $(CURDIR)/debian/python3-swh.storage.listener/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 		mkdir -p $(CURDIR)/debian/python3-swh.storage.provenance/usr/lib/python$$pyvers/dist-packages/swh/storage/provenance ; \
 		mv $(CURDIR)/debian/python3-swh.storage/usr/lib/python$$pyvers/dist-packages/swh/storage/provenance/* \
 		   $(CURDIR)/debian/python3-swh.storage.provenance/usr/lib/python$$pyvers/dist-packages/swh/storage/provenance/ ; \
 		mkdir -p $(CURDIR)/debian/python3-swh.storage.schemata/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 		mv $(CURDIR)/debian/python3-swh.storage/usr/lib/python$$pyvers/dist-packages/swh/storage/schemata \
 		   $(CURDIR)/debian/python3-swh.storage.schemata/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 	done
-
-override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-        PYBUILD_TEST_ARGS="cd {build_dir}; python{version} -m nose swh -sva '!db'" \
-        dh_auto_test