diff --git a/debian/control b/debian/control
index 22c71ac..f992a0a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,29 +1,29 @@
 Source: swh-loader-git
 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-dulwich,
                python3-nose,
                python3-retrying,
                python3-setuptools,
                python3-swh.core (>= 0.0.7~),
                python3-swh.model (>= 0.0.15~),
                python3-swh.scheduler (>= 0.0.14~),
                python3-swh.storage (>= 0.0.83~),
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DLDG/
 
 Package: python3-swh.loader.git
 Architecture: all
 Depends: python3-swh.core (>= 0.0.7~),
          python3-swh.model (>= 0.0.15~),
          python3-swh.scheduler (>= 0.0.14~),
          python3-swh.storage (>= 0.0.83~),
          ${misc:Depends},
          ${python3:Depends}
 Description: Software Heritage Git loader
diff --git a/debian/rules b/debian/rules
index 37cdade..7803287 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-loader-git
+export PYBUILD_NAME=swh.loader.git
+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
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/loader/__init__.py
diff --git a/setup.py b/setup.py
index e21041d..9949208 100644
--- a/setup.py
+++ b/setup.py
@@ -1,30 +1,30 @@
 #!/usr/bin/env python3
 
-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
 
 
 setup(
     name='swh.loader.git',
     description='Software Heritage git loader',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DCORE/',
-    packages=['swh.loader.git', 'swh.loader.git.tests'],
+    packages=find_packages(),
     scripts=[],
     install_requires=parse_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__)
diff --git a/swh/loader/__init__.py b/swh/loader/__init__.py
new file mode 100644
index 0000000..69e3be5
--- /dev/null
+++ b/swh/loader/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)