diff --git a/ironic/tests/unit/api/test_base.py b/ironic/tests/unit/api/test_base.py
index f15f4724cf..237076de6f 100644
--- a/ironic/tests/unit/api/test_base.py
+++ b/ironic/tests/unit/api/test_base.py
@@ -102,7 +102,7 @@ class TestVersion(base.BaseApiTest):
         self.assertTrue(hasattr(ver_1, '__eq__'))
         self.assertEqual(ver_1, ver_2)
         # Force __eq__ to be called and return False
-        self.assertFalse(ver_1 == ver_3)
+        self.assertFalse(ver_1 == ver_3)  # noqa
 
     def test_not_equals(self):
         ver_1 = cbase.Version(
@@ -114,7 +114,7 @@ class TestVersion(base.BaseApiTest):
         self.assertTrue(hasattr(ver_1, '__ne__'))
         self.assertNotEqual(ver_1, ver_3)
         # Force __ne__ to be called and return False
-        self.assertFalse(ver_1 != ver_2)
+        self.assertFalse(ver_1 != ver_2)  # noqa
 
     def test_greaterthan(self):
         ver_1 = cbase.Version(
@@ -124,7 +124,7 @@ class TestVersion(base.BaseApiTest):
         self.assertTrue(hasattr(ver_1, '__gt__'))
         self.assertGreater(ver_1, ver_2)
         # Force __gt__ to be called and return False
-        self.assertFalse(ver_2 > ver_1)
+        self.assertFalse(ver_2 > ver_1)  # noqa
 
     def test_lessthan(self):
         # __lt__ is created by @functools.total_ordering, make sure it exists
@@ -136,4 +136,4 @@ class TestVersion(base.BaseApiTest):
         self.assertTrue(hasattr(ver_1, '__lt__'))
         self.assertLess(ver_1, ver_2)
         # Force __lt__ to be called and return False
-        self.assertFalse(ver_2 < ver_1)
+        self.assertFalse(ver_2 < ver_1)  # noqa
diff --git a/test-requirements.txt b/test-requirements.txt
index 846eb0da95..073f938870 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.0.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
@@ -19,7 +19,7 @@ testresources>=0.2.4 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 WebTest>=2.0 # MIT
 bashate>=0.2 # Apache-2.0
-flake8-import-order==0.11 # LGPLv3
+flake8-import-order>=0.13 # LGPLv3
 
 # Doc requirements
 sphinx>=1.6.2 # BSD
diff --git a/tox.ini b/tox.ini
index 9ce83368f1..0e7cbdabd3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -104,8 +104,10 @@ application-import-names = ironic
 max-complexity=17
 # [H106] Don’t put vim configuration in source files.
 # [H203] Use assertIs(Not)None to check for None.
+# [H204] Use assert(Not)Equal to check for equality.
+# [H205] Use assert(Greater|Less)(Equal) for comparison.
 # [H904] Delay string interpolations at logging calls.
-enable-extensions=H106,H203,H904
+enable-extensions=H106,H203,H204,H205,H904
 
 [hacking]
 import_exceptions = testtools.matchers, ironic.common.i18n