diff --git a/keystoneauth1/hacking/checks.py b/keystoneauth1/hacking/checks.py
index ae25459f..1d92e71c 100644
--- a/keystoneauth1/hacking/checks.py
+++ b/keystoneauth1/hacking/checks.py
@@ -33,4 +33,4 @@ def check_oslo_namespace_imports(logical_line, blank_before, filename):
         msg = ("K333: '%s' must be used instead of '%s'.") % (
             logical_line.replace('oslo.', 'oslo_'),
             logical_line)
-        yield(0, msg)
+        yield (0, msg)
diff --git a/keystoneauth1/loading/opts.py b/keystoneauth1/loading/opts.py
index d12688a6..b46a3ba9 100644
--- a/keystoneauth1/loading/opts.py
+++ b/keystoneauth1/loading/opts.py
@@ -112,7 +112,7 @@ class Opt(object):
 
     def __eq__(self, other):
         """Define equality operator on option parameters."""
-        return (type(self) == type(other) and
+        return (type(self) is type(other) and
                 self.name == other.name and
                 self.type == other.type and
                 self.help == other.help and
diff --git a/keystoneauth1/tests/unit/loading/utils.py b/keystoneauth1/tests/unit/loading/utils.py
index 3b4f6755..ee838cf3 100644
--- a/keystoneauth1/tests/unit/loading/utils.py
+++ b/keystoneauth1/tests/unit/loading/utils.py
@@ -73,7 +73,7 @@ class BoolType(object):
     def __eq__(self, other):
         """Define equiality for many bool types."""
         # hack around oslo.config equality comparison
-        return type(self) == type(other)
+        return type(self) is type(other)
 
     # NOTE: This function is only needed by Python 2. If we get to point where
     # we don't support Python 2 anymore, this function should be removed.
diff --git a/test-requirements.txt b/test-requirements.txt
index 6a0305f7..d37e6cf8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
-hacking~=4.1.0 # Apache-2.0
-flake8-docstrings~=1.6.0 # MIT
-flake8-import-order>=0.17.1 #LGPLv3
+hacking~=6.1.0 # Apache-2.0
+flake8-docstrings~=1.7.0 # MIT
+flake8-import-order~=0.18.2 #LGPLv3
 bandit~=1.7.6 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0