diff --git a/cinderclient/tests/functional/test_readonly_cli.py b/cinderclient/tests/functional/test_readonly_cli.py
index cd62972e1..3483aa499 100644
--- a/cinderclient/tests/functional/test_readonly_cli.py
+++ b/cinderclient/tests/functional/test_readonly_cli.py
@@ -52,7 +52,7 @@ class CinderClientReadOnlyTests(base.ClientTestBase):
         tables = self.parser.tables(out)
         for table in tables:
             headers = table['headers']
-            self.assertTrue(2 >= len(headers))
+            self.assertGreaterEqual(2, len(headers))
             self.assertEqual('Value', headers[1])
 
     def test_extra_specs_list(self):
diff --git a/cinderclient/tests/unit/test_api_versions.py b/cinderclient/tests/unit/test_api_versions.py
index 8e212cb44..752013156 100644
--- a/cinderclient/tests/unit/test_api_versions.py
+++ b/cinderclient/tests/unit/test_api_versions.py
@@ -59,12 +59,12 @@ class APIVersionTestCase(utils.TestCase):
         v4 = api_versions.APIVersion("2.0")
         v_null = api_versions.APIVersion()
 
-        self.assertTrue(v1 < v2)
-        self.assertTrue(v3 > v2)
-        self.assertTrue(v1 != v2)
-        self.assertTrue(v1 == v4)
-        self.assertTrue(v1 != v_null)
-        self.assertTrue(v_null == v_null)
+        self.assertLess(v1, v2)
+        self.assertGreater(v3, v2)
+        self.assertNotEqual(v1, v2)
+        self.assertEqual(v1, v4)
+        self.assertNotEqual(v1, v_null)
+        self.assertEqual(v_null, v_null)
         self.assertRaises(TypeError, v1.__le__, "2.1")
 
     def test_version_matches(self):
diff --git a/cinderclient/tests/unit/v1/contrib/test_list_extensions.py b/cinderclient/tests/unit/v1/contrib/test_list_extensions.py
index 989cc902c..25c90522d 100644
--- a/cinderclient/tests/unit/v1/contrib/test_list_extensions.py
+++ b/cinderclient/tests/unit/v1/contrib/test_list_extensions.py
@@ -29,6 +29,6 @@ class ListExtensionsTests(utils.TestCase):
     def test_list_extensions(self):
         all_exts = cs.list_extensions.show_all()
         cs.assert_called('GET', '/extensions')
-        self.assertTrue(len(all_exts) > 0)
+        self.assertGreater(len(all_exts), 0)
         for r in all_exts:
-            self.assertTrue(len(r.summary) > 0)
+            self.assertGreater(len(r.summary), 0)
diff --git a/cinderclient/tests/unit/v2/contrib/test_list_extensions.py b/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
index 3e22b7ada..03f35461b 100644
--- a/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
+++ b/cinderclient/tests/unit/v2/contrib/test_list_extensions.py
@@ -31,6 +31,6 @@ class ListExtensionsTests(utils.TestCase):
     def test_list_extensions(self):
         all_exts = cs.list_extensions.show_all()
         cs.assert_called('GET', '/extensions')
-        self.assertTrue(len(all_exts) > 0)
+        self.assertGreater(len(all_exts), 0)
         for r in all_exts:
-            self.assertTrue(len(r.summary) > 0)
+            self.assertGreater(len(r.summary), 0)