diff --git a/MANIFEST.in b/MANIFEST.in
index d807701d4..401787fe7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,2 @@
-include README.rst
-graft google
-global-exclude *.pyc __pycache__
+include README.rst LICENSE CHANGELOG.rst
+recursive-include tests *
diff --git a/setup.py b/setup.py
index 5f72e00a3..389dafffc 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
     description='Google Authentication Library',
     long_description=long_description,
     url='https://github.com/GoogleCloudPlatform/google-auth-library-python',
-    packages=find_packages(exclude=('tests', 'system_tests')),
+    packages=find_packages(exclude=('tests*', 'system_tests*')),
     namespace_packages=('google',),
     install_requires=DEPENDENCIES,
     extras_require={