diff --git a/oslo_messaging/_drivers/impl_qpid.py b/oslo_messaging/_drivers/impl_qpid.py
index 464023054..ebfd75b54 100644
--- a/oslo_messaging/_drivers/impl_qpid.py
+++ b/oslo_messaging/_drivers/impl_qpid.py
@@ -668,7 +668,7 @@ class Connection(object):
 
         def _consume():
             # NOTE(sileht):
-            # maximun value choosen according the best practice from kombu:
+            # maximum value chosen according the best practice from kombu:
             # http://kombu.readthedocs.org/en/latest/reference/kombu.common.html#kombu.common.eventloop
             poll_timeout = 1 if timeout is None else min(timeout, 1)
 
diff --git a/oslo_messaging/tests/test_utils.py b/oslo_messaging/tests/test_utils.py
index 5754205e5..84b677a64 100644
--- a/oslo_messaging/tests/test_utils.py
+++ b/oslo_messaging/tests/test_utils.py
@@ -61,7 +61,7 @@ class TimerTestCase(test_utils.BaseTestCase):
         remaining = t.check_return()
         self.assertEqual(None, remaining)
 
-    def test_no_duration_but_maximun(self):
+    def test_no_duration_but_maximum(self):
         t = common.DecayingTimer()
         t.start()
         remaining = t.check_return(maximum=2)