diff --git a/sushy_tools/tests/unit/emulator/resources/test_volumes.py b/sushy_tools/tests/unit/emulator/resources/test_volumes.py
index a6d1c860..0d08c005 100644
--- a/sushy_tools/tests/unit/emulator/resources/test_volumes.py
+++ b/sushy_tools/tests/unit/emulator/resources/test_volumes.py
@@ -71,7 +71,7 @@ class StaticDriverTestCase(base.BaseTestCase):
         self.test_driver.add_volume(self.SYSTEM_UUID, self.STORAGE_ID, vol)
         vol_col = self.test_driver.get_volumes_col(self.SYSTEM_UUID,
                                                    self.STORAGE_ID)
-        self.assertTrue(vol in vol_col)
+        self.assertIn(vol, vol_col)
 
     def test_delete_volume(self):
         vol = {
@@ -85,4 +85,4 @@ class StaticDriverTestCase(base.BaseTestCase):
         self.test_driver.delete_volume(self.SYSTEM_UUID, self.STORAGE_ID, vol)
         vol_col = self.test_driver.get_volumes_col(self.SYSTEM_UUID,
                                                    self.STORAGE_ID)
-        self.assertFalse(vol in vol_col)
+        self.assertNotIn(vol, vol_col)
diff --git a/tox.ini b/tox.ini
index 221fa50c..67ea071e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,10 +18,10 @@ commands = stestr run {posargs}
            stestr slowest
 
 [testenv:pep8]
-deps =
-    hacking>=3.1.0,<4.0.0 # Apache-2.0
+deps=
+    hacking>=4.1.0,<5.0.0 # Apache-2.0
     flake8-import-order>=0.17.1 # LGPLv3
-    pycodestyle>=2.0.0,<2.7.0 # MIT
+    pycodestyle>=2.0.0,<3.0.0 # MIT
 commands = flake8 {posargs}
 
 [testenv:venv]