diff --git a/manila/share/drivers/qnap/qnap.py b/manila/share/drivers/qnap/qnap.py
index 5cc454d288..87e6df1c9b 100644
--- a/manila/share/drivers/qnap/qnap.py
+++ b/manila/share/drivers/qnap/qnap.py
@@ -298,7 +298,7 @@ class QnapShareDriver(driver.ShareDriver):
 
     def delete_share(self, context, share, share_server=None):
         """Delete the specified share."""
-        # Use private_storage to retreive volume ID created in the NAS.
+        # Use private_storage to retrieve volume ID created in the NAS.
         volID = self.private_storage.get(share['id'], 'volID')
         if not volID:
             LOG.warning('volID for Share %s does not exist', share['id'])
diff --git a/manila_tempest_tests/tests/api/admin/test_user_messages.py b/manila_tempest_tests/tests/api/admin/test_user_messages.py
index a887970853..6bcd7cf8a6 100644
--- a/manila_tempest_tests/tests/api/admin/test_user_messages.py
+++ b/manila_tempest_tests/tests/api/admin/test_user_messages.py
@@ -61,7 +61,7 @@ class UserMessageTest(base.BaseSharesAdminTest):
         # for number of keys in response's dict, if there is only single
         # key, it returns directly this key, otherwise it returns
         # parsed body. If limit param is used, then API returns
-        # multiple keys in reponse ('messages' and 'message_links')
+        # multiple keys in response ('messages' and 'message_links')
         messages = body['messages']
         self.assertIsInstance(messages, list)
         ids = [x['resource_id'] for x in messages]