diff --git a/setup.cfg b/setup.cfg
index 0d74e0c7119da287976be6f9e6f1516e9860f959..0b0899d89f4199e264506b3360f58f209974f820 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,19 +27,16 @@ classifier =
     License :: OSI Approved :: MIT License
     Topic :: Software Development :: Libraries
 
-[pycodestyle]
-max-line-length = 100
-
-[pep8]
-max-line-length = 100
-
-[bdist_wheel]
-universal = 1
-
 [options]
 install_requires =
     psutil
 python_requires = !=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+package_dir=
+    =satella
+packages=find:
+
+[options.packages.find]
+where=satella
 
 [options.extras_require]
 HTTPJSONSource = requests
@@ -48,3 +45,12 @@ TOMLSource = toml
 FasterJSON = ujson
 cassandra = cassandra-driver
 opentracing = opentracing
+
+[pycodestyle]
+max-line-length = 100
+
+[pep8]
+max-line-length = 100
+
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index d80c71cdab993b7f738a3b318c995306263abdcf..905f3b03ad4ba9801a5b4dfd667665ab475ac131 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,5 @@
-from setuptools import setup, find_packages
+from setuptools import setup
 from satella import __version__
 
 
-setup(packages=find_packages(include=['satella', 'satella.*']),
-      version=__version__,
-      test_suite='nose2.collector.collector'
-      )
+setup(version=__version__)