diff --git a/lower-constraints.txt b/lower-constraints.txt
index 32c993c..626f601 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,8 +1,10 @@
-cinder==13.0.0
+cinder==17.0.0
 mock==2.0.0
-os-brick==2.7.0
-pbr==2.0.0
-six==1.10.0
-stestr==1.0.0
-stevedore==1.20.0
+os-brick==4.0.1
+oslo.context==2.23.0
+oslo.db==6.0.0
+pbr==5.4.1
+six==1.11.0
+stestr==2.2.0
+stevedore==1.31.0
 urllib3==1.21.1
diff --git a/requirements.txt b/requirements.txt
index 634976d..942afcb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-cinder>=15.0.0 # Apache-2.0
+cinder>=17.0.0 # Apache-2.0
 importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 3368534..ac8ee6e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,11 +2,17 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
-hacking>=3.0.1,<3.1.0 # Apache-2.0
-coverage!=4.4,>=4.0 # Apache-2.0
-ddt>=1.0.1 # MIT
+pbr>=5.4.1 # Apache-2.0
+hacking>=3.0.1,<3.2.0 # Apache-2.0
+coverage!=4.4,>=4.1 # Apache-2.0
+ddt>=1.2.1 # MIT
 oslotest>=3.2.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
-testtools>=2.2.0 # MIT
-stestr>=1.0.0 # Apache-2.0
+testtools>=2.4.0 # MIT
+stestr>=2.2.0 # Apache-2.0
+#
+# These are included to constrain the range of possible versions
+# considered by the pip resolver.  They are not direct dependencies
+# of cinderlib.
+oslo.context>=2.23.0 # Apache-2.0
+oslo.db>=6.0.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 5ece099..ff7a08b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -143,6 +143,13 @@ commands =
     coverage html -d cover
     coverage xml -o cover/coverage.xml
 
+[flake8]
+# see comment in cinderlib/cinderlib.py for why we need to ignore E402
+# (import order) in these files
+per-file-ignores =
+    cinderlib/cinderlib.py:E402
+    cinderlib/cmd/cinder_to_yaml.py:E402
+
 [testenv:pep8]
 commands=flake8 {posargs} .
 deps=