diff --git a/requirements.txt b/requirements.txt
index 23c0fd90d..c9510c747 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,10 +3,9 @@
 # process, which may cause wedges in the gate later.
 PyYAML>=3.1.0
 Jinja2>=2.6 # BSD License (3 clause)
-pip>=6.0
 pbr<2.0,>=1.6
 Babel>=1.3
-oslo.config>=2.3.0 # Apache-2.0
-oslo.log>=1.8.0 # Apache-2.0
+oslo.config>=3.2.0 # Apache-2.0
+oslo.log>=1.14.0 # Apache-2.0
 six>=1.9.0
 PyMySQL>=0.6.2  # MIT License
diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh
index 3f4a63aeb..496b3faa5 100755
--- a/scripts/env-setup.sh
+++ b/scripts/env-setup.sh
@@ -42,9 +42,19 @@ fi
 # We can't use the apt packaged version of pip since
 # older versions of pip are incompatible with
 # requests, one of our indirect dependencies (bug 1459947).
-wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
-sudo -H -E python /tmp/get-pip.py
 
+# Note(TheJulia) This originally appeared because older
+# versions of pip would do the wrong thing, 1459947.
+# However, now pip 8.0 breaks things.  See 1536627
+#wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
+#sudo -H -E python /tmp/get-pip.py
+
+if ! which pip; then
+    wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
+    sudo -H -E python /tmp/get-pip.py
+fi
+
+sudo -H -E pip install "pip>6.0,<8.0"
 sudo -H -E pip install -r "$(dirname $0)/../requirements.txt"
 
 u=$(whoami)