diff --git a/AUTHORS b/AUTHORS
index 7f9754ba4..df10dcd15 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,6 +42,7 @@ Nicholas Mistry <nmistry@gmail.com>
 Nikolay Sokolov <nsokolov@griddynamics.com>
 Pádraig Brady <pbrady@redhat.com>
 Pavel Shkitin <pshkitin@griddynamics.com>
+Peng Yong <ppyy@pubyun.com>
 Rick Harris <rconradharris@gmail.com>
 Robie Basak <robie.basak@canonical.com>
 Russell Bryant <rbryant@redhat.com>
diff --git a/setup.py b/setup.py
index 457340926..264cbbaf8 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ setuptools.setup(
     long_description=read_file("README.rst"),
     license="Apache License, Version 2.0",
     url="https://github.com/openstack/python-novaclient",
-    packages=["novaclient", "novaclient.v1_1", "novaclient.v1_1.contrib"],
+    packages=setuptools.find_packages(exclude=['tests', 'tests.*']),
     install_requires=requirements,
     tests_require=["nose", "mock"],
     test_suite="nose.collector",