diff --git a/setup.py b/setup.py
index 52dc745763..3c89586416 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
 install_reqs = [
     'appdirs', 'colorama>=0.3.3', 'jinja2', 'six',
     'enum34; python_version<"3.4"', 'sh>=1.10; sys_platform!="nt"',
-    'pep517', 'pytoml', 'virtualenv'
+    'pep517<0.7.0"', 'pytoml', 'virtualenv'
 ]
 # (pep517, pytoml and virtualenv are used by pythonpackage.py)
 
diff --git a/tests/test_pythonpackage_basic.py b/tests/test_pythonpackage_basic.py
index 7b92f79721..3d1a156df6 100644
--- a/tests/test_pythonpackage_basic.py
+++ b/tests/test_pythonpackage_basic.py
@@ -303,7 +303,7 @@ def test_virtualenv(self):
             ])
             subprocess.check_output([
                 os.path.join(test_dir, "virtualenv", "bin", "pip"),
-                "install", "-U", "pep517"
+                "install", "-U", "pep517<0.7.0"
             ])
             sys_python_path = self.run__get_system_python_executable(
                 os.path.join(test_dir, "virtualenv", "bin", "python")
@@ -336,7 +336,7 @@ def test_venv(self):
             ])
             subprocess.check_output([
                 os.path.join(test_dir, "venv", "bin", "pip"),
-                "install", "-U", "pep517"
+                "install", "-U", "pep517<0.7.0"
             ])
             sys_python_path = self.run__get_system_python_executable(
                 os.path.join(test_dir, "venv", "bin", "python")