diff --git a/debian/control b/debian/control
index 02653d2..49c2aae 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,21 @@
 Source: swh-model
 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,
                python3-setuptools,
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DMOD/
 
 Package: python3-swh.model
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
 Breaks: python3-swh.loader.core (<< 0.0.16~),
         python3-swh.loader.dir (<< 0.0.28~),
         python3-swh.loader.svn (<< 0.0.28~)
 Description: Software Heritage data model
diff --git a/debian/rules b/debian/rules
index 9036158..9a1760e 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 8d2e843..232f3bc 100644
--- a/setup.py
+++ b/setup.py
@@ -1,40 +1,37 @@
 import hashlib
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def parse_requirements():
     requirements = []
     for reqf in ('requirements.txt', 'requirements-swh.txt'):
         with open(reqf) as f:
             for line in f.readlines():
                 line = line.strip()
                 if not line or line.startswith('#'):
                     continue
                 requirements.append(line)
     return requirements
 
 
 extra_requirements = []
 
 
 pyblake2_hashes = {'blake2s256', 'blake2b512'}
 if pyblake2_hashes - set(hashlib.algorithms_available):
     extra_requirements.append('pyblake2')
 
 setup(
     name='swh.model',
     description='Software Heritage data model',
     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'],
     vcversioner={},
     include_package_data=True,
 )
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__)