diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index e16d0bea..00000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-alembic==0.9.6
-appdirs==1.3.0
-Babel==2.3.4
-bandit==1.4.0
-cffi==1.7.0
-cliff==2.8.0
-cmd2==0.8.0
-coverage==4.0
-debtcollector==1.2.0
-decorator==3.4.0
-eventlet==0.18.2
-extras==1.0.0
-fixtures==3.0.0
-flake8==2.5.5
-future==0.16.0
-gitdb==0.6.4
-GitPython==1.0.1
-greenlet==0.4.10
-hacking==0.12.0
-iso8601==0.1.11
-keystoneauth1==3.4.0
-linecache2==1.0.0
-Mako==0.4.0
-MarkupSafe==1.0
-mccabe==0.2.1
-mock==2.0.0
-monotonic==0.6
-mox3==0.20.0
-netaddr==0.7.18
-netifaces==0.10.4
-os-client-config==1.28.0
-os-testr==1.0.0
-oslo.config==5.2.0
-oslo.context==2.19.2
-oslo.i18n==3.15.3
-oslo.utils==3.33.0
-oslotest==3.2.0
-pbr==2.0.0
-pep8==1.5.7
-pifpaf==0.10.0
-prettytable==0.7.2
-psycopg2==2.7.0
-pycparser==2.18
-pyflakes==0.8.1
-PyMySQL==0.7.6
-pyparsing==2.1.0
-pyperclip==1.5.27
-python-editor==1.0.3
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.12
-requests==2.14.2
-requestsexceptions==1.2.0
-rfc3986==0.3.1
-six==1.10.0
-smmap==0.9.0
-SQLAlchemy==1.0.10
-sqlalchemy-migrate==0.11.0
-sqlparse==0.2.2
-stevedore==1.20.0
-Tempita==0.5.2
-testrepository==0.0.18
-stestr==2.0.0
-testresources==2.0.0
-testscenarios==0.4
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
-wrapt==1.7.0
-xattr==0.9.2
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 07a07854..505a58cb 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 "
diff --git a/tox.ini b/tox.ini
index 1a073a81..0531af4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -84,10 +84,3 @@ basepython = python3
 deps = bindep
 commands = bindep test
 usedevelop = False
-
-[testenv:lower-constraints]
-basepython = python3
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt