diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py
index a1a1964d1..62a68c13e 100644
--- a/cinderclient/tests/unit/test_shell.py
+++ b/cinderclient/tests/unit/test_shell.py
@@ -113,14 +113,14 @@ class ShellTest(utils.TestCase):
         v2_url, v3_url = _shell._discover_auth_versions(
             None, auth_url=os_auth_url)
         self.assertEqual(v2_url, os_auth_url, "Expected v2 url")
-        self.assertEqual(v3_url, None, "Expected no v3 url")
+        self.assertIsNone(v3_url, "Expected no v3 url")
 
         os_auth_url = "https://DiscoveryNotSupported.discovery.com:35357/v3.0"
         self.register_keystone_auth_fixture(mocker, os_auth_url)
         v2_url, v3_url = _shell._discover_auth_versions(
             None, auth_url=os_auth_url)
         self.assertEqual(v3_url, os_auth_url, "Expected v3 url")
-        self.assertEqual(v2_url, None, "Expected no v2 url")
+        self.assertIsNone(v2_url, "Expected no v2 url")
 
     @mock.patch('sys.stdin', side_effect=mock.MagicMock)
     @mock.patch('getpass.getpass', return_value='password')
diff --git a/cinderclient/tests/unit/v2/test_consistencygroups.py b/cinderclient/tests/unit/v2/test_consistencygroups.py
index 390162e4e..2bb17cdef 100644
--- a/cinderclient/tests/unit/v2/test_consistencygroups.py
+++ b/cinderclient/tests/unit/v2/test_consistencygroups.py
@@ -89,7 +89,7 @@ class ConsistencygroupsTest(utils.TestCase):
         cs.assert_called('PUT', '/consistencygroups/1234', body=expected)
 
     def test_update_consistencygroup_none(self):
-        self.assertEqual(None, cs.consistencygroups.update('1234'))
+        self.assertIsNone(cs.consistencygroups.update('1234'))
 
     def test_update_consistencygroup_no_props(self):
         cs.consistencygroups.update('1234')
diff --git a/cinderclient/tests/unit/v2/test_volumes.py b/cinderclient/tests/unit/v2/test_volumes.py
index 0a3f4e546..b56d908da 100644
--- a/cinderclient/tests/unit/v2/test_volumes.py
+++ b/cinderclient/tests/unit/v2/test_volumes.py
@@ -235,7 +235,7 @@ class FormatSortParamTestCase(utils.TestCase):
 
     def test_format_sort_empty_input(self):
         for s in [None, '', []]:
-            self.assertEqual(None, cs.volumes._format_sort_param(s))
+            self.assertIsNone(cs.volumes._format_sort_param(s))
 
     def test_format_sort_string_single_key(self):
         s = 'id'