diff --git a/setup.py b/setup.py
index 206ac60..9352eab 100644
--- a/setup.py
+++ b/setup.py
@@ -1,23 +1,33 @@
 #!/usr/bin/env python3
 
-from distutils.core import setup
+from setuptools import setup, find_packages
+from codecs import open
+from os import path
 from pyetrade import __version__
 
+here = path.abspath(path.dirname(__file__))
+
+# Get the long description from the README file
+with open(path.join(here, "README.md"), encoding="utf-8") as f:
+    long_description = f.read()
+
 # requirements
-with open("requirements.txt") as requirements:
-    req = [i.strip() for i in requirements]
+with open(path.join(here, "requirements.txt"), encoding="utf-8") as f:
+    all_reqs = f.read().split("\n")
+
+install_requires = [x.strip() for x in all_reqs if "git+" not in x]
 
 setup(
     name="pyetrade",
     version=__version__,
     description="eTrade API wrappers",
+    long_description=long_description,
     author="Jesse Cooper",
     author_email="jesse_cooper@codeholics.com",
     url="https://github.com/jessecooper/pyetrade",
     license="GPLv3",
-    packages=["pyetrade"],
-    package_dir={"pyetrade": "pyetrade"},
-    install_requires=req,
+    packages=find_packages(exclude=["docs", "test*"]),
+    install_requires=install_requires,
     platforms=["any"],
     keywords=["etrade", "pyetrade", "stocks"],
     classifiers=[
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index 43db90f..0000000
--- a/tests/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python3
-
-__ALL__ = ["test_authorization", "test_accounts"]
-
-__title__ = "tests"
-__version__ = "0.1"
-__author__ = "Jesse Cooper"
-
-from . import test_authorization
-from . import test_accounts