diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index de40ea7..0000000
--- a/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/qurator/__init__.py b/qurator/__init__.py
deleted file mode 100644
index 8d17c21..0000000
--- a/qurator/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
-
diff --git a/setup.py b/setup.py
index a1293b9..9e6b762 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from io import open
 from json import load
-from setuptools import find_packages, setup
+from setuptools import find_namespace_packages, setup
 
 with open('requirements.txt') as fp:
     install_requires = fp.read()
@@ -18,10 +18,8 @@
     keywords='qurator',
     license='Apache License 2.0',
     url="https://github.com/qurator-spk/neath",
-    packages=find_packages(exclude=["*.tests", "*.tests.*",
-                                    "tests.*", "tests"]),
+    packages=find_namespace_packages(include=['qurator']),
     install_requires=install_requires,
-    namespace_packages=['qurator'],
     package_data={
         '': ['*.json']
     },