diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py b/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py
index 9dcac0639..574fd470f 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py
@@ -129,16 +129,14 @@ class BaremetalAllocationTests(base.TestCase):
 
     @ddt.data(
         ('--uuid', '', 'expected one argument'),
-        ('--uuid', '!@#$^*&%^', 'Expected a UUID'),
+        ('--uuid', '!@#$^*&%^', 'Expected UUID for uuid'),
         ('--extra', '', 'expected one argument'),
         ('--name', '', 'expected one argument'),
         ('--name', 'not/a/name', 'invalid name'),
         ('--resource-class', '', 'expected one argument'),
-        ('--resource-class', 'x' * 81,
-         'Value should have a maximum character requirement of 80'),
+        ('--resource-class', 'x' * 81, 'is too long'),
         ('--trait', '', 'expected one argument'),
-        ('--trait', 'foo',
-         'A custom trait must start with the prefix CUSTOM_'),
+        ('--trait', 'foo', 'does not match'),
         ('--candidate-node', '', 'expected one argument'),
         ('--candidate-node', 'banana?', 'Nodes cannot be found'),
         ('--wait', 'meow', 'invalid int value'))
diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py b/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py
index d3bfdbe9b..37423d848 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py
@@ -158,12 +158,12 @@ class BaremetalDeployTemplateTests(base.TestCase):
 
     @ddt.data(
         ('--uuid', '', 'expected one argument'),
-        ('--uuid', '!@#$^*&%^', 'Expected a UUID'),
+        ('--uuid', '!@#$^*&%^', 'Expected UUID for uuid'),
         ('', '', 'the following arguments are required'),
-        ('', 'not/a/name', 'Deploy template name must be a valid trait'),
-        ('', 'foo', 'Deploy template name must be a valid trait'),
+        ('', 'not/a/name', 'does not match'),
+        ('', 'foo', 'does not match'),
         ('--steps', '', 'expected one argument'),
-        ('--steps', '[]', 'No deploy steps specified'))
+        ('--steps', '[]', 'is too short'))
     @ddt.unpack
     def test_create_negative(self, argument, value, ex_text):
         """Check errors on invalid input parameters."""
diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py b/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
index 82c4201dd..d4107e080 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
@@ -27,7 +27,7 @@ class BaremetalNodeCreateNegativeTests(base.TestCase):
 
     @ddt.data(
         ('--uuid', '', 'expected one argument'),
-        ('--uuid', '!@#$^*&%^', 'Expected a UUID'),
+        ('--uuid', '!@#$^*&%^', 'Expected UUID for uuid'),
         ('--uuid', '0000 0000', 'unrecognized arguments'),
         ('--driver-info', '', 'expected one argument'),
         ('--driver-info', 'some info', 'unrecognized arguments'),
diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index e6971091e..000000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-appdirs==1.3.0
-asn1crypto==0.23.0
-Babel==2.3.4
-cffi==1.14.0
-chardet==3.0.4
-cliff==2.8.0
-cmd2==0.8.0
-coverage==4.0
-cryptography==2.7
-ddt==1.0.1
-debtcollector==1.2.0
-decorator==3.4.0
-doc8==0.6.0
-docutils==0.11
-dogpile.cache==0.8.0
-extras==1.0.0
-fasteners==0.7.0
-fixtures==3.0.0
-flake8==2.5.5
-flake8-import-order==0.17.1
-future==0.16.0
-hacking==3.0.0
-idna==2.6
-iso8601==0.1.11
-jmespath==0.9.0
-jsonpatch==1.16
-jsonpointer==1.13
-jsonschema==3.2.0
-keystoneauth1==3.4.0
-linecache2==1.0.0
-mccabe==0.2.1
-monotonic==0.6
-mox3==0.20.0
-msgpack-python==0.4.0
-munch==2.1.0
-netaddr==0.7.18
-netifaces==0.10.4
-openstacksdk==0.18.0
-os-client-config==1.28.0
-os-service-types==1.2.0
-osc-lib==2.0.0
-oslo.concurrency==3.26.0
-oslo.config==5.2.0
-oslo.context==2.19.2
-oslo.i18n==3.15.3
-oslo.log==3.36.0
-oslo.serialization==2.18.0
-oslo.utils==3.33.0
-oslotest==3.2.0
-paramiko==2.0.0
-pbr==2.0.0
-pep8==1.5.7
-positional==1.2.1
-prettytable==0.7.1
-pyasn1==0.1.8
-pycodestyle==2.5.0
-pycparser==2.18
-pyflakes==0.8.1
-Pygments==2.2.0
-pyinotify==0.9.6
-pyOpenSSL==17.1.0
-pyparsing==2.1.0
-pyperclip==1.5.27
-python-cinderclient==3.3.0
-python-dateutil==2.5.3
-python-glanceclient==2.8.0
-python-keystoneclient==3.8.0
-python-mimeparse==1.6.0
-python-novaclient==9.1.0
-python-openstackclient==3.12.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.13
-requests==2.14.2
-requests-mock==1.2.0
-requestsexceptions==1.2.0
-restructuredtext-lint==1.1.1
-rfc3986==0.3.1
-simplejson==3.5.1
-six==1.14.0
-snowballstemmer==1.2.1
-stestr==1.0.0
-stevedore==1.20.0
-tempest==17.1.0
-testrepository==0.0.20
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
-urllib3==1.21.1
-warlock==1.2.0
-wrapt==1.7.0
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 17b52e83e..6e8741874 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,7 +2,6 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
       - openstack-python3-wallaby-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti