diff --git a/setup.py b/setup.py
index 5ddc4cc8..6156b417 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ BigchainDB: A Scalable Blockchain Database
 For full docs visit https://bigchaindb.readthedocs.org
 
 """
-from setuptools import setup
+from setuptools import setup, find_packages
 
 tests_require = [
     'pytest',
@@ -56,12 +56,7 @@ setup(
         'Operating System :: POSIX :: Linux',
     ],
 
-    packages=[
-        'bigchaindb',
-        'bigchaindb.commands',
-        'bigchaindb.db',
-        'bigchaindb.web'
-    ],
+    packages=find_packages(exclude=['tests*']),
 
     entry_points={
         'console_scripts': [