diff --git a/PKG-INFO b/PKG-INFO
index 8cf842c30faf2540ab4ef86436e86fcc83e45d11..71abcc9579b2eabbda54cdb39a9597eaeef27372 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: swh.model
-Version: 0.0.18
+Version: 0.0.19
 Summary: Software Heritage data model
 Home-page: https://forge.softwareheritage.org/diffusion/DMOD/
 Author: Software Heritage developers
diff --git a/debian/control b/debian/control
index 02653d2ee890a1369d33db389b3825e767d24609..49c2aae10397ecc8de1ab3502e910edea430994b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-python,
+               dh-python (>= 2),
                python3 (>= 3.5) | python3-pyblake2,
                python3-all,
                python3-nose,
diff --git a/debian/rules b/debian/rules
index 9036158063baef628911d00e1d5eaa401da764cd..9a1760ecfd6dab6f7fdc0de7347d94a5ffeec9f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-model
+export PYBUILD_NAME=swh.model
+export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-        PYBUILD_TEST_ARGS="cd {build_dir}; python{version} -m nose swh -sva '!db,!fs'" \
-        dh_auto_test
+override_dh_install:
+	dh_install
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py
diff --git a/setup.py b/setup.py
index 8d2e843cc2269322fcae0c9248b0399c180de910..232f3bc236391f21c8be9bed35dcd97f590890df 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 import hashlib
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def parse_requirements():
@@ -28,10 +28,7 @@ setup(
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DMOD/',
-    packages=[
-        'swh.model', 'swh.model.fields',
-        'swh.model.tests', 'swh.model.tests.fields',
-    ],  # packages's modules
+    packages=find_packages(),  # packages's modules
     scripts=[],   # scripts to package
     install_requires=parse_requirements() + extra_requirements,
     setup_requires=['vcversioner'],
diff --git a/swh.model.egg-info/PKG-INFO b/swh.model.egg-info/PKG-INFO
index 8cf842c30faf2540ab4ef86436e86fcc83e45d11..71abcc9579b2eabbda54cdb39a9597eaeef27372 100644
--- a/swh.model.egg-info/PKG-INFO
+++ b/swh.model.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: swh.model
-Version: 0.0.18
+Version: 0.0.19
 Summary: Software Heritage data model
 Home-page: https://forge.softwareheritage.org/diffusion/DMOD/
 Author: Software Heritage developers
diff --git a/swh.model.egg-info/SOURCES.txt b/swh.model.egg-info/SOURCES.txt
index f88b36d8d8986741d8a5ba3395af1e497fdaa1c1..bd2e46a13762f6726a8e68040be297c6c048d5c3 100644
--- a/swh.model.egg-info/SOURCES.txt
+++ b/swh.model.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ docs/data-model.rst
 docs/index.rst
 docs/_static/.placeholder
 docs/_templates/.placeholder
+swh/__init__.py
 swh.model.egg-info/PKG-INFO
 swh.model.egg-info/SOURCES.txt
 swh.model.egg-info/dependency_links.txt
diff --git a/swh/__init__.py b/swh/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..69e3be50dac40cddced86e9df2f9c2df5a75f004
--- /dev/null
+++ b/swh/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/version.txt b/version.txt
index 99574ed9d87d56511e39bcd98638ae7f79fae840..b5266cae00ec939c83cf0e0c685ea1dd4bccf081 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.0.18-0-g34228c5
\ No newline at end of file
+v0.0.19-0-g0b7f217
\ No newline at end of file