diff --git a/senlin/tests/unit/api/common/test_version_request.py b/senlin/tests/unit/api/common/test_version_request.py
index 9f1f53037..f6b1acc77 100644
--- a/senlin/tests/unit/api/common/test_version_request.py
+++ b/senlin/tests/unit/api/common/test_version_request.py
@@ -78,18 +78,18 @@ class APIVersionRequestTests(base.SenlinTestCase):
         vers4 = vr.APIVersionRequest("2.0")
         v_null = vr.APIVersionRequest()
 
-        self.assertTrue(v_null < vers2)
-        self.assertTrue(vers1 < vers2)
-        self.assertTrue(vers1 <= vers2)
-        self.assertTrue(vers1 <= vers4)
-        self.assertTrue(vers2 > v_null)
-        self.assertTrue(vers3 > vers2)
-        self.assertTrue(vers1 >= vers4)
-        self.assertTrue(vers3 >= vers2)
-        self.assertTrue(vers1 != vers2)
-        self.assertTrue(vers1 == vers4)
-        self.assertTrue(vers1 != v_null)
-        self.assertTrue(v_null == v_null)
+        self.assertLess(v_null, vers2)
+        self.assertLess(vers1, vers2)
+        self.assertLessEqual(vers1, vers2)
+        self.assertLessEqual(vers1, vers4)
+        self.assertGreater(vers2, v_null)
+        self.assertGreater(vers3, vers2)
+        self.assertGreaterEqual(vers1, vers4)
+        self.assertGreaterEqual(vers3, vers2)
+        self.assertNotEqual(vers1, vers2)
+        self.assertEqual(vers1, vers4)
+        self.assertNotEqual(vers1, v_null)
+        self.assertEqual(v_null, v_null)
         self.assertRaises(TypeError, vers1.__lt__, "2.1")
 
     def test_version_matches(self):
diff --git a/senlin/tests/unit/engine/test_health_manager.py b/senlin/tests/unit/engine/test_health_manager.py
index c95dcb3a5..c32ccfcd9 100644
--- a/senlin/tests/unit/engine/test_health_manager.py
+++ b/senlin/tests/unit/engine/test_health_manager.py
@@ -40,7 +40,7 @@ class TestChaseUp(base.SenlinTestCase):
         # we assume that the delay before next line is < 5 seconds
         res = hm._chase_up(start, 5)
 
-        self.assertTrue(res <= 5)
+        self.assertLessEqual(res, 5)
 
     def test_more_than_one_interval(self):
         start = tu.utcnow(True)
@@ -49,7 +49,7 @@ class TestChaseUp(base.SenlinTestCase):
         # we assume that the delay before next line is < 5 seconds
         res = hm._chase_up(start, 1)
 
-        self.assertTrue(res <= 1)
+        self.assertLessEqual(res, 1)
 
 
 @mock.patch('oslo_messaging.NotificationFilter')
diff --git a/test-requirements.txt b/test-requirements.txt
index 90b12c350..6aa67988a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,10 +5,11 @@
 # Hacking already pins down pep8, pyflakes and flake8
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8<2.6.0,>=2.5.4 # MIT
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
+pycodestyle==2.0.0
 PyMySQL>=0.7.6 # MIT License
 tempest>=17.1.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD