diff --git a/debian/rules b/debian/rules
index b86925b..7f4935e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,19 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=swh.objstorage
+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.objstorage.cloud/usr/lib/python$$pyvers/dist-packages/swh/objstorage/cloud ; \
 		mv $(CURDIR)/debian/python3-swh.objstorage/usr/lib/python$$pyvers/dist-packages/swh/objstorage/cloud/* \
 		$(CURDIR)/debian/python3-swh.objstorage.cloud/usr/lib/python$$pyvers/dist-packages/swh/objstorage/cloud/ ; \
 	done
 
 override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-        PYBUILD_TEST_ARGS="cd {build_dir}; python{version} -m nose swh -sva '!db'" \
-        no_proxy=127.0.0.1 \
-        dh_auto_test
+	no_proxy=127.0.0.1 dh_auto_test
diff --git a/setup.py b/setup.py
index cbd6803..daf3104 100644
--- a/setup.py
+++ b/setup.py
@@ -1,39 +1,33 @@
-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
 
 
 # Edit this part to match your module
 # full sample: https://forge.softwareheritage.org/diffusion/DCORE/browse/master/setup.py
 setup(
     name='swh.objstorage',
     description='Software Heritage Object Storage',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DOBJS',
-    packages=[
-        'swh.objstorage',
-        'swh.objstorage.api',
-        'swh.objstorage.cloud',
-        'swh.objstorage.multiplexer',
-        'swh.objstorage.multiplexer.filter'
-    ],  # packages's modules
+    packages=find_packages(),
     scripts=[
         'bin/swh-objstorage-add-dir',
         'bin/swh-objstorage-fsck'
     ],   # scripts to package
     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__)