diff --git a/keystoneclient/tests/test_base.py b/keystoneclient/tests/test_base.py
index 7f60ce951..023d80742 100644
--- a/keystoneclient/tests/test_base.py
+++ b/keystoneclient/tests/test_base.py
@@ -72,7 +72,7 @@ class BaseTest(utils.TestCase):
 
     def test_human_id(self):
         r = base.Resource(None, {"name": "1 of !"})
-        self.assertEqual(r.human_id, None)
+        self.assertIsNone(r.human_id)
         r = HumanReadable(None, {"name": "1 of !"})
         self.assertEqual(r.human_id, "1-of")
 
diff --git a/keystoneclient/tests/v2_0/test_access.py b/keystoneclient/tests/v2_0/test_access.py
index 548edcfb1..f6774807c 100644
--- a/keystoneclient/tests/v2_0/test_access.py
+++ b/keystoneclient/tests/v2_0/test_access.py
@@ -44,11 +44,11 @@ class AccessInfoTest(utils.TestCase, testresources.ResourcedTestCase):
 
         self.assertEqual(auth_ref.role_names, [])
 
-        self.assertEqual(auth_ref.tenant_name, None)
-        self.assertEqual(auth_ref.tenant_id, None)
+        self.assertIsNone(auth_ref.tenant_name)
+        self.assertIsNone(auth_ref.tenant_id)
 
-        self.assertEqual(auth_ref.auth_url, None)
-        self.assertEqual(auth_ref.management_url, None)
+        self.assertIsNone(auth_ref.auth_url)
+        self.assertIsNone(auth_ref.management_url)
 
         self.assertFalse(auth_ref.scoped)
         self.assertFalse(auth_ref.domain_scoped)
diff --git a/keystoneclient/tests/v2_0/test_service_catalog.py b/keystoneclient/tests/v2_0/test_service_catalog.py
index 21f2b88d7..e74904de7 100644
--- a/keystoneclient/tests/v2_0/test_service_catalog.py
+++ b/keystoneclient/tests/v2_0/test_service_catalog.py
@@ -136,7 +136,7 @@ class ServiceCatalogTest(utils.TestCase):
         self.assertEqual(urls[0], 'https://image.south.host/v1/')
 
         urls = sc.get_urls(service_type='image', region_name='West')
-        self.assertEqual(urls, None)
+        self.assertIsNone(urls)
 
     def test_service_catalog_param_overrides_body_region(self):
         self.AUTH_RESPONSE_BODY['access']['region_name'] = "North"
diff --git a/keystoneclient/tests/v3/test_service_catalog.py b/keystoneclient/tests/v3/test_service_catalog.py
index 87853e12c..9a4cc5c28 100644
--- a/keystoneclient/tests/v3/test_service_catalog.py
+++ b/keystoneclient/tests/v3/test_service_catalog.py
@@ -151,7 +151,7 @@ class ServiceCatalogTest(utils.TestCase):
         self.assertEqual(urls[0], self.south_endpoints['public'])
 
         urls = sc.get_urls(service_type='image', region_name='West')
-        self.assertEqual(urls, None)
+        self.assertIsNone(urls)
 
     def test_service_catalog_param_overrides_body_region(self):
         self.AUTH_RESPONSE_BODY['token']['region_name'] = "North"