--- requirements.txt
+++ requirements.txt
@@ -27,9 +27,6 @@
 # All new style configurations are in the yaml format
 pyyaml
 
-# The new main entrypoint uses argparse instead of optparse
-argparse
-
 # Requests handles ssl correctly!
 requests
 
--- setup.py
+++ setup.py
@@ -198,7 +198,7 @@
 
 requirements = read_requires()
 if sys.version_info < (3,):
-    requirements.append('cheetah')
+    requirements.extend(('cheetah', 'argparse'))
 
 setuptools.setup(
     name='cloud-init',