diff --git a/oslo_messaging/tests/drivers/test_impl_kafka.py b/oslo_messaging/tests/drivers/test_impl_kafka.py
index dcbab0a88..e58ef7330 100644
--- a/oslo_messaging/tests/drivers/test_impl_kafka.py
+++ b/oslo_messaging/tests/drivers/test_impl_kafka.py
@@ -285,4 +285,4 @@ class TestWithRealKafkaBroker(test_utils.BaseTestCase):
         deadline = time.time() + 3
         received_message = listener.poll(timeout=3)
         self.assertEqual(0, int(deadline - time.time()))
-        self.assertEqual(None, received_message)
+        self.assertIsNone(received_message)
diff --git a/oslo_messaging/tests/notify/test_logger.py b/oslo_messaging/tests/notify/test_logger.py
index 12d1cd100..bf7e2d961 100644
--- a/oslo_messaging/tests/notify/test_logger.py
+++ b/oslo_messaging/tests/notify/test_logger.py
@@ -84,7 +84,7 @@ class TestLogNotifier(test_utils.BaseTestCase):
                          n['priority'])
         self.assertEqual('logrecord', n['event_type'])
         self.assertEqual(str(timeutils.utcnow()), n['timestamp'])
-        self.assertEqual(None, n['publisher_id'])
+        self.assertIsNone(n['publisher_id'])
         self.assertEqual(
             {'process': os.getpid(),
              'funcName': None,
@@ -134,7 +134,7 @@ class TestLogNotifier(test_utils.BaseTestCase):
                          n['priority'])
         self.assertEqual('logrecord', n['event_type'])
         self.assertEqual(str(timeutils.utcnow()), n['timestamp'])
-        self.assertEqual(None, n['publisher_id'])
+        self.assertIsNone(n['publisher_id'])
         pathname = __file__
         if pathname.endswith(('.pyc', '.pyo')):
             pathname = pathname[:-1]
diff --git a/oslo_messaging/tests/test_fixture.py b/oslo_messaging/tests/test_fixture.py
index 2ad1117d6..5c7218f0b 100644
--- a/oslo_messaging/tests/test_fixture.py
+++ b/oslo_messaging/tests/test_fixture.py
@@ -76,7 +76,6 @@ class TestConfFixture(test_utils.BaseTestCase):
 
         self.assertEqual([],
                          conf.oslo_messaging_notifications.driver)
-        self.assertEqual(None,
-                         conf.oslo_messaging_notifications.transport_url)
+        self.assertIsNone(conf.oslo_messaging_notifications.transport_url)
         self.assertEqual(['notifications'],
                          conf.oslo_messaging_notifications.topics)
\ No newline at end of file
diff --git a/oslo_messaging/tests/test_utils.py b/oslo_messaging/tests/test_utils.py
index 9c9e2f09a..5e8354a4d 100644
--- a/oslo_messaging/tests/test_utils.py
+++ b/oslo_messaging/tests/test_utils.py
@@ -56,7 +56,7 @@ class TimerTestCase(test_utils.BaseTestCase):
         t = common.DecayingTimer()
         t.start()
         remaining = t.check_return()
-        self.assertEqual(None, remaining)
+        self.assertIsNone(remaining)
 
     def test_no_duration_but_maximum(self):
         t = common.DecayingTimer()