diff --git a/debian/rules b/debian/rules
index f9e4bb76..539785e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,23 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=swh.storage
-export PYBUILD_TEST_ARGS=-sv -a !db,!fs swh/storage
+export export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-
 override_dh_install:
 	dh_install
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py
+
 	for pyvers in $(shell py3versions -vr); do \
 		mkdir -p $(CURDIR)/debian/python3-swh.storage.listener/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 		mv $(CURDIR)/debian/python3-swh.storage/usr/lib/python$$pyvers/dist-packages/swh/storage/listener.py \
 		   $(CURDIR)/debian/python3-swh.storage.listener/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 		mkdir -p $(CURDIR)/debian/python3-swh.storage.provenance/usr/lib/python$$pyvers/dist-packages/swh/storage/provenance ; \
 		mv $(CURDIR)/debian/python3-swh.storage/usr/lib/python$$pyvers/dist-packages/swh/storage/provenance/* \
 		   $(CURDIR)/debian/python3-swh.storage.provenance/usr/lib/python$$pyvers/dist-packages/swh/storage/provenance/ ; \
 		mkdir -p $(CURDIR)/debian/python3-swh.storage.schemata/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 		mv $(CURDIR)/debian/python3-swh.storage/usr/lib/python$$pyvers/dist-packages/swh/storage/schemata \
 		   $(CURDIR)/debian/python3-swh.storage.schemata/usr/lib/python$$pyvers/dist-packages/swh/storage/ ; \
 	done
diff --git a/setup.py b/setup.py
index 20c98092..211092f1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,42 +1,36 @@
 #!/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.storage',
     description='Software Heritage storage manager',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DSTO/',
-    packages=[
-        'swh.storage',
-        'swh.storage.api',
-        'swh.storage.provenance',
-        'swh.storage.schemata',
-        'swh.storage.tests',
-    ],
+    packages=find_packages(),
     scripts=[
         'bin/swh-storage-add-dir',
     ],
     install_requires=parse_requirements(),
     extras_require={
         'schemata': ['SQLAlchemy'],
         'listener': ['kafka_python'],
     },
     setup_requires=['vcversioner'],
     vcversioner={},
     include_package_data=True,
 )
diff --git a/swh/__init__.py b/swh/__init__.py
new file mode 100644
index 00000000..69e3be50
--- /dev/null
+++ b/swh/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)