diff --git a/acme/setup.py b/acme/setup.py
index 48210108a..df9937032 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -13,6 +13,7 @@ install_requires = [
     # rsa_recover_prime_factors (>=0.8)
     'cryptography>=0.8',
     # Connection.set_tlsext_host_name (>=0.13)
+    'mock',
     'PyOpenSSL>=0.13',
     'pyrfc3339',
     'pytz',
@@ -27,15 +28,6 @@ install_requires = [
     'six',
 ]
 
-# env markers in extras_require cause problems with older pip: #517
-# Keep in sync with conditional_requirements.py.
-if sys.version_info < (2, 7):
-    install_requires.extend([
-        'mock<1.1.0',
-    ])
-else:
-    install_requires.append('mock')
-
 dev_extras = [
     'nose',
     'tox',
diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py
index 56a48abc6..db8cb11db 100644
--- a/certbot-apache/setup.py
+++ b/certbot-apache/setup.py
@@ -10,6 +10,7 @@ version = '0.13.0.dev0'
 install_requires = [
     'acme=={0}'.format(version),
     'certbot=={0}'.format(version),
+    'mock',
     'python-augeas',
     # For pkg_resources. >=1.0 so pip resolves it to a version cryptography
     # will tolerate; see #2599:
@@ -18,11 +19,6 @@ install_requires = [
     'zope.interface',
 ]
 
-if sys.version_info < (2, 7):
-    install_requires.append('mock<1.1.0')
-else:
-    install_requires.append('mock')
-
 docs_extras = [
     'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
     'sphinx_rtd_theme',
diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py
index 73d3b704b..238d7a2d5 100644
--- a/certbot-compatibility-test/setup.py
+++ b/certbot-compatibility-test/setup.py
@@ -9,16 +9,12 @@ version = '0.13.0.dev0'
 install_requires = [
     'certbot',
     'certbot-apache',
+    'mock',
     'six',
     'requests',
     'zope.interface',
 ]
 
-if sys.version_info < (2, 7):
-    install_requires.append('mock<1.1.0')
-else:
-    install_requires.append('mock')
-
 if sys.version_info < (2, 7, 9):
     # For secure SSL connexion with Python 2.7 (InsecurePlatformWarning)
     install_requires.append('ndg-httpsclient')
diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py
index 24c2564b9..bdc45b9b4 100644
--- a/certbot-nginx/setup.py
+++ b/certbot-nginx/setup.py
@@ -10,6 +10,7 @@ version = '0.13.0.dev0'
 install_requires = [
     'acme=={0}'.format(version),
     'certbot=={0}'.format(version),
+    'mock',
     'PyOpenSSL',
     'pyparsing>=1.5.5',  # Python3 support; perhaps unnecessary?
     # For pkg_resources. >=1.0 so pip resolves it to a version cryptography
@@ -18,11 +19,6 @@ install_requires = [
     'zope.interface',
 ]
 
-if sys.version_info < (2, 7):
-    install_requires.append('mock<1.1.0')
-else:
-    install_requires.append('mock')
-
 docs_extras = [
     'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
     'sphinx_rtd_theme',
diff --git a/letshelp-certbot/setup.py b/letshelp-certbot/setup.py
index b616da688..b26ab41fe 100644
--- a/letshelp-certbot/setup.py
+++ b/letshelp-certbot/setup.py
@@ -7,12 +7,9 @@ from setuptools import find_packages
 version = '0.7.0.dev0'
 
 install_requires = [
+    'mock',
     'setuptools',  # pkg_resources
 ]
-if sys.version_info < (2, 7):
-    install_requires.append('mock<1.1.0')
-else:
-    install_requires.append('mock')
 
 docs_extras = [
     'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
diff --git a/setup.py b/setup.py
index 8ce4c51c9..0e8d19a22 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ install_requires = [
     'ConfigArgParse>=0.9.3',
     'configobj',
     'cryptography>=0.7',  # load_pem_x509_certificate
+    'mock',
     'parsedatetime>=1.3',  # Calendar.parseDT
     'PyOpenSSL',
     'pyrfc3339',
@@ -55,15 +56,6 @@ install_requires = [
     'zope.interface',
 ]
 
-# env markers in extras_require cause problems with older pip: #517
-# Keep in sync with conditional_requirements.py.
-if sys.version_info < (2, 7):
-    install_requires.extend([
-        'mock<1.1.0',
-    ])
-else:
-    install_requires.append('mock')
-
 dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
     'astroid==1.3.5',