diff --git a/setup.py b/setup.py
index dcee95408..dbfa5620c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from setuptools import setup
+from setuptools import setup, find_packages
 import os
 
 long_description = open("README.rst").read()
@@ -24,9 +24,7 @@
 setup(
     name="neo",
     version=neo_version,
-    packages=[
-        'neo', 'neo.core', 'neo.io', 'neo.rawio', 'neo.test',
-        'neo.test.coretest', 'neo.test.iotest', 'neo.test.rawiotest'],
+    packages=find_packages(),
     install_requires=install_requires,
     extras_require=extras_require,
     author="Neo authors and contributors",