diff --git a/setup.py b/setup.py
index 9968e19..0f8fd1e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,7 @@
 import os
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-    
+from setuptools import setup, find_packages
+PACKAGES = find_packages()
+
 # Get version and release info, which is all stored in shablona/version.py
 ver_file = os.path.join('shablona', 'version.py')
 with open(ver_file) as f:
diff --git a/shablona/version.py b/shablona/version.py
index af6da81..9c666ac 100644
--- a/shablona/version.py
+++ b/shablona/version.py
@@ -70,7 +70,5 @@
 MINOR = _version_minor
 MICRO = _version_micro
 VERSION = __version__
-PACKAGES = ['shablona',
-            'shablona.tests']
 PACKAGE_DATA = {'shablona': [pjoin('data', '*')]}
 REQUIRES = ["numpy"]