diff --git a/docs/changelog.rst b/docs/changelog.rst
index 15383cf..500c29f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -33,3 +33,7 @@ Changes in Version 1.0.3
 * Fixed various typos in the documentation.
 * Fix duplicate debug log message issue that can occur when multiple client
   objects are created.
+* Updated setup.py package requirements to be consistent with the ones
+  defined in requirements.txt.
+* Updated setup.py package test-requirements to be consistent with the ones
+  defined in test-requirements.txt.
diff --git a/requirements.txt b/requirements.txt
index 9b7ae3a..97c6c28 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1 @@
-eventlet
-paramiko>=1.13.0
-Werkzeug
+httplib2>=0.6.0
diff --git a/setup.py b/setup.py
index a6e2e88..b8519d7 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ setup(
   keywords=["hp", "lefthand", "storevirtual", "rest"],
   requires=['httplib2(>=0.6.0)'],
   install_requires=['httplib2 >= 0.6.0'],
-  tests_require=["nose", "werkzeug", "nose-testconfig"],
+  tests_require=["nose", "nose-testconfig", "flask", "Werkzeug", "flake8"],
   license="Apache License, Version 2.0",
   packages=find_packages(),
   provides=['hplefthandclient'],
@@ -32,6 +32,5 @@ setup(
      'Programming Language :: Python :: 2.7',
      'Programming Language :: Python :: 3.0',
      'Topic :: Internet :: WWW/HTTP',
-     
      ]
   )
diff --git a/test-requirements.txt b/test-requirements.txt
index ab24e8d..fdb4d59 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,6 @@
 nose
 nose-testconfig
-flake8
 flask
+Werkzeug
+
+flake8 # Used by tox