diff --git a/setup.py b/setup.py
index d538246..86d8ffe 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
 
 import sys
 
-if sys.version_info <= (2, 6):
+if sys.version_info < (2, 6):
   print('google-api-python-client requires python version >= 2.6.',
         file=sys.stderr)
   sys.exit(1)
@@ -39,6 +39,9 @@
     'uritemplate>=0.6',
 ]
 
+if sys.version_info < (2, 7):
+  install_requires.append('argparse')
+
 long_desc = """The Google API Client for Python is a client library for
 accessing the Plus, Moderator, and many other Google APIs."""
 
diff --git a/tox.ini b/tox.ini
index 492de8d..5a5dfbc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,11 +6,9 @@
        mox
        pyopenssl
        pycrypto==2.6
-       django==1.2
+       django
        webtest
        nose
-       uritemplate
-       oauth2client
 setenv = PYTHONPATH=../google_appengine
 
 [testenv:py26]