diff --git a/debian/control b/debian/control
index 10661d1..3cf9cf2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,19 @@
-Source: <module-name>
+Source: <dash-separated-module-name>
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-python,
+               dh-python (>= 2),
                python3-all,
                python3-nose,
                python3-setuptools,
                python3-swh.core,
                python3-swh.storage,
                python3-vcversioner
 Standards-Version: 3.9.6
-Homepage: https://forge.softwareheritage.org/diffusion/<PHABRICATOR_CALLSIGN>/
+Homepage: https://forge.softwareheritage.org/source/<phabricator short name>/
 
 Package: python3-<dot-separated-name-module>
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage <module-description>
diff --git a/debian/rules b/debian/rules
index 7443399..bf1f169 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=<dash-separated-module-name>
+export PYBUILD_NAME=<dot-separated-module-name>
+export PYBUILD_TEST_ARGS=--with-doctest -sva !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
-
-
-override_dh_auto_test:
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__)