diff --git a/lower-constraints.txt b/lower-constraints.txt
index 5e28b9ecd..e8059237a 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -5,7 +5,7 @@ coverage==4.0
 croniter==0.3.4
 doc8==0.6.0
 dogpile.cache==0.6.2
-eventlet==0.20.0
+eventlet==0.26.0
 fixtures==3.0.0
 Jinja2==2.10
 jsonschema==3.2.0
diff --git a/requirements.txt b/requirements.txt
index d0a1d7bb4..c72f99049 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ Babel!=2.4.0,>=2.3.4 # BSD
 croniter>=0.3.4 # MIT License
 cachetools>=2.0.0 # MIT License
 dogpile.cache>=0.6.2 # BSD
-eventlet!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.20.0 # MIT
+eventlet>=0.26.0 # MIT
 Jinja2>=2.10 # BSD License (3 clause)
 jsonschema>=3.2.0 # MIT
 keystonemiddleware>=4.18.0 # Apache-2.0
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index ab662a406..8b420875d 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
 sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
     DELETE FROM mysql.user WHERE User='';
     FLUSH PRIVILEGES;
-    GRANT ALL PRIVILEGES ON *.*
-        TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
+    CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
+    GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
 
 # Now create our database.
 mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "