diff --git a/astara/test/unit/api/test_neutron_wrapper.py b/astara/test/unit/api/test_neutron_wrapper.py
index 6685a475..f4fb4c77 100644
--- a/astara/test/unit/api/test_neutron_wrapper.py
+++ b/astara/test/unit/api/test_neutron_wrapper.py
@@ -157,7 +157,7 @@ class TestuNeutronModels(base.RugTestBase):
         }
         s = neutron.Subnet.from_dict(d)
         self.assertEqual(netaddr.IPNetwork('fe80::/64'), s.cidr)
-        self.assertIs(None, s.gateway_ip)
+        self.assertIsNone(s.gateway_ip)
 
     def test_subnet_gateway_not_ip(self):
         d = {
@@ -175,7 +175,7 @@ class TestuNeutronModels(base.RugTestBase):
         }
         s = neutron.Subnet.from_dict(d)
         self.assertEqual(netaddr.IPNetwork('fe80::/64'), s.cidr)
-        self.assertIs(None, s.gateway_ip)
+        self.assertIsNone(s.gateway_ip)
 
     def test_subnet_cidr_none(self):
         d = {
diff --git a/astara/test/unit/test_notifications.py b/astara/test/unit/test_notifications.py
index a60e1152..3d3f25fb 100644
--- a/astara/test/unit/test_notifications.py
+++ b/astara/test/unit/test_notifications.py
@@ -233,7 +233,7 @@ class TestGetCRUD(base.RugTestBase):
 
     def test_notification_astara(self):
         e = self._get_event_notification('astara.bandwidth.used')
-        self.assertIs(None, e)
+        self.assertIsNone(e)
 
     def test_notification_cmd_poll(self):
         event_type = 'astara.command'