diff --git a/heat/tests/test_clients.py b/heat/tests/test_clients.py
index ae997e2857..8c00d401ed 100644
--- a/heat/tests/test_clients.py
+++ b/heat/tests/test_clients.py
@@ -31,7 +31,7 @@ class ClientsTest(HeatTestCase):
         obj = clients.Clients(con)
         obj._get_client_option = mock.Mock()
         obj._get_client_option.return_value = None
-        self.assertEqual(None, obj._get_heat_url())
+        self.assertIsNone(obj._get_heat_url())
         heat_url = "http://0.0.0.0:8004/v1/%(tenant_id)s"
         obj._get_client_option.return_value = heat_url
         tenant_id = "b363706f891f48019483f8bd6503c54b"
diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index 8c85ec1498..c77e185195 100644
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -908,7 +908,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
         self.assertEqual((old_stack.UPDATE, old_stack.COMPLETE),
                          old_stack.state)
         self.assertEqual(create_stack.identifier(), result)
-        self.assertNotEqual(None, create_stack.identifier().stack_id)
+        self.assertIsNotNone(create_stack.identifier().stack_id)
         self.assertEqual(create_stack.identifier().arn(),
                          old_stack['A'].properties['Foo'])
 
@@ -989,7 +989,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
         self.assertEqual((old_nested.UPDATE, old_nested.COMPLETE),
                          old_nested.state)
         self.assertEqual(create_stack.identifier(), result)
-        self.assertNotEqual(None, create_stack.identifier().stack_id)
+        self.assertIsNotNone(create_stack.identifier().stack_id)
         self.assertEqual(create_nested.identifier().arn(),
                          old_nested['A'].properties['Foo'])