diff --git a/MANIFEST.in b/MANIFEST.in
index 8f48abf..0d9cf1c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,7 +3,5 @@ include README.rst
 
 recursive-include tests *
 recursive-include requirements *
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
 
 recursive-include docs *.rst conf.py Makefile
diff --git a/setup.py b/setup.py
index 3275ba9..ddfcf57 100755
--- a/setup.py
+++ b/setup.py
@@ -23,8 +23,9 @@
 
 import os
 import sys
-from setuptools import setup
-from setuptools.command.build_ext import build_ext
+from setuptools import setup, find_packages
+
+os.chdir(os.path.dirname(sys.argv[0]) or ".")
 
 import re
 VERSIONFILE = "wolfcrypt/_version.py"
@@ -61,11 +62,7 @@ setup(
     url="https://github.com/wolfssl/wolfcrypt-py",
     license="GPLv2 or Commercial License",
 
-    packages=["wolfcrypt"],
-
-    zip_safe=False,
-    cffi_modules=["./wolfcrypt/_build_ffi.py:ffibuilder"],
-
+    packages=find_packages(),
     keywords="wolfssl, wolfcrypt, security, cryptography",
     classifiers=[
         u"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
@@ -80,6 +77,7 @@ setup(
         u"Topic :: Software Development"
     ],
 
-    setup_requires=["cffi"],
-    install_requires=["cffi"]
+    setup_requires=["cffi>=1.0.0"],
+    install_requires=["cffi>=1.0.0"],
+    cffi_modules=["./wolfcrypt/_build_ffi.py:ffibuilder"]
 )
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tox.ini b/tox.ini
index 9dab8ee..f3d3896 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,6 @@ envlist = py3
 
 [testenv]
 wheel = true
-setenv =
-    PYTHONPATH = {toxinidir}:{toxinidir}/wolfcrypt-py
 
 deps = -rrequirements/test.txt
 commands = py.test tests/