diff --git a/oslo_messaging/_drivers/amqp1_driver/addressing.py b/oslo_messaging/_drivers/amqp1_driver/addressing.py
index 36c0031d2..1a99caed1 100644
--- a/oslo_messaging/_drivers/amqp1_driver/addressing.py
+++ b/oslo_messaging/_drivers/amqp1_driver/addressing.py
@@ -256,7 +256,7 @@ class AddresserFactory(object):
         self._kwargs = kwargs
 
     def __call__(self, remote_properties):
-        # for backwards compatiblity use legacy if dynamic and we're connected
+        # for backwards compatibility use legacy if dynamic and we're connected
         # to qpidd or we cannot identify the message bus.  This can be
         # overridden via the configuration.
         product = remote_properties.get('product', 'qpid-cpp')
diff --git a/setup.cfg b/setup.cfg
index 90abec984..4fdfad846 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -59,7 +59,7 @@ oslo.messaging.notify.drivers =
 
 oslo.messaging.pika.connection_factory =
     # Creates new connection for each create_connection call. Old-style behaviour
-    # Uses a much more connections then single and read_write factories but still avalable as
+    # Uses a much more connections then single and read_write factories but still available as
     # an option
     new = oslo_messaging._drivers.pika_driver.pika_connection_factory:PikaConnectionFactory