diff --git a/debian/control b/debian/control
index 83ffa94..fb265f2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,22 @@
 Source: swh-scheduler
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-python,
+               dh-python (>= 2),
                python3-all,
                python3-arrow,
                python3-celery,
                python3-click,
                python3-nose,
                python3-psycopg2,
                python3-setuptools,
                python3-swh.core (>= 0.0.34),
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DSCH/
 
 Package: python3-swh.scheduler
 Architecture: all
 Depends: python3-swh.core (>= 0.0.34), ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Scheduler
diff --git a/debian/rules b/debian/rules
index 4f952c9..4fe0cf9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-scheduler
+export PYBUILD_NAME=swh.scheduler
+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="python{version} -m nose -sv swh.scheduler -a '!db'" \
-	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 2f383a4..72825ac 100644
--- a/setup.py
+++ b/setup.py
@@ -1,34 +1,32 @@
-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.scheduler',
     description='Software Heritage Scheduler',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DSCH/',
-    packages=[
-        'swh.scheduler', 'swh.scheduler.celery_backend', 'swh.scheduler.tests'
-    ],
-    scripts=['bin/swh-worker-control'],   # scripts to package
+    packages=find_packages(),
+    scripts=['bin/swh-worker-control'],
     install_requires=parse_requirements(),
     entry_points='''
         [console_scripts]
         swh-scheduler=swh.scheduler.cli:cli
     ''',
     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__)