diff --git a/hardware/generate.py b/hardware/generate.py
index 71fb8b95..fa5b6cb1 100644
--- a/hardware/generate.py
+++ b/hardware/generate.py
@@ -134,7 +134,7 @@ def generate(model, prefix=_PREFIX):
 
     # Safe guard for models without ranges
     for value in model.values():
-        if type(value) != STRING_TYPE:
+        if not isinstance(value, STRING_TYPE):
             break
         elif _RANGE_REGEXP.search(value):
             break
diff --git a/tox.ini b/tox.ini
index abf955ba..8c8174d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,8 +22,8 @@ commands =
 
 [testenv:pep8]
 deps=
-    hacking>=6.0.0 # Apache-2.0
-    flake8-import-order>=0.17.1 # LGPLv3
+    hacking~=6.1.0 # Apache-2.0
+    flake8-import-order~=0.18.0 # LGPLv3
     pycodestyle>=2.0.0,<3.0.0 # MIT
 commands = flake8 {posargs}