diff --git a/debian/control b/debian/control
index c753680..1ffec31 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,32 @@
 Source: swh-vault
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-python,
+               dh-python (>= 2),
                python3-all,
                python3-click,
                python3-dateutil,
                python3-dulwich,
                python3-fastimport,
                python3-flask,
                python3-nose,
                python3-psycopg2,
                python3-setuptools,
                python3-swh.core (>= 0.0.28~),
                python3-swh.model (>= 0.0.18~),
                python3-swh.objstorage (>= 0.0.17~),
                python3-swh.scheduler (>= 0.0.11~),
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DVAU/
 
 Package: python3-swh.vault
 Architecture: all
 Depends: python3-swh.core (>= 0.0.28~),
          python3-swh.model (>= 0.0.18~),
          python3-swh.objstorage (>= 0.0.17~),
          python3-swh.scheduler (>= 0.0.11~),
          ${misc:Depends},
          ${python3:Depends}
 Description: Software Heritage <module-description>
diff --git a/debian/rules b/debian/rules
index 77a7442..f7063c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-vault
+export PYBUILD_NAME=swh.vault
+export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-
-override_dh_auto_test:
+override_dh_install:
+	dh_install
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py
diff --git a/swh/__init__.py b/swh/__init__.py
new file mode 100644
index 0000000..69e3be5
--- /dev/null
+++ b/swh/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)