diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index 0f155601a8..0bfe131019 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -51,10 +51,10 @@ class TestServer(compute_fakes.TestComputev2):
         self.volumes_mock = self.app.client_manager.volume.volumes
         self.volumes_mock.reset_mock()
 
-        # Set object attributes to be tested. Could be overwriten in subclass.
+        # Set object attributes to be tested. Could be overwritten in subclass.
         self.attrs = {}
 
-        # Set object methods to be tested. Could be overwriten in subclass.
+        # Set object methods to be tested. Could be overwritten in subclass.
         self.methods = {}
 
     def setup_servers_mock(self, count):
diff --git a/openstackclient/tests/compute/v2/test_server_backup.py b/openstackclient/tests/compute/v2/test_server_backup.py
index b6802ff032..8eeb0dcabd 100644
--- a/openstackclient/tests/compute/v2/test_server_backup.py
+++ b/openstackclient/tests/compute/v2/test_server_backup.py
@@ -34,10 +34,10 @@ class TestServerBackup(compute_fakes.TestComputev2):
         self.images_mock = self.app.client_manager.image.images
         self.images_mock.reset_mock()
 
-        # Set object attributes to be tested. Could be overwriten in subclass.
+        # Set object attributes to be tested. Could be overwritten in subclass.
         self.attrs = {}
 
-        # Set object methods to be tested. Could be overwriten in subclass.
+        # Set object methods to be tested. Could be overwritten in subclass.
         self.methods = {}
 
     def setup_servers_mock(self, count):
diff --git a/openstackclient/tests/compute/v2/test_server_image.py b/openstackclient/tests/compute/v2/test_server_image.py
index 8a8bd9bc90..c3c52da05f 100644
--- a/openstackclient/tests/compute/v2/test_server_image.py
+++ b/openstackclient/tests/compute/v2/test_server_image.py
@@ -33,10 +33,10 @@ class TestServerImage(compute_fakes.TestComputev2):
         self.images_mock = self.app.client_manager.image.images
         self.images_mock.reset_mock()
 
-        # Set object attributes to be tested. Could be overwriten in subclass.
+        # Set object attributes to be tested. Could be overwritten in subclass.
         self.attrs = {}
 
-        # Set object methods to be tested. Could be overwriten in subclass.
+        # Set object methods to be tested. Could be overwritten in subclass.
         self.methods = {}
 
     def setup_servers_mock(self, count):
diff --git a/openstackclient/tests/image/v2/fakes.py b/openstackclient/tests/image/v2/fakes.py
index 8e22fbb2e5..c2a8d7217b 100644
--- a/openstackclient/tests/image/v2/fakes.py
+++ b/openstackclient/tests/image/v2/fakes.py
@@ -190,7 +190,7 @@ class FakeImage(object):
 
         :param Dictionary attrs:
             A dictionary with all attrbutes of image
-        :retrun:
+        :return:
             A FakeResource object with id, name, owner, protected,
             visibility and tags attrs
         """
diff --git a/openstackclient/tests/volume/v1/fakes.py b/openstackclient/tests/volume/v1/fakes.py
index 6c349866dd..2584d4b10d 100644
--- a/openstackclient/tests/volume/v1/fakes.py
+++ b/openstackclient/tests/volume/v1/fakes.py
@@ -157,7 +157,7 @@ class FakeTransfer(object):
 
         :param Dictionary attrs:
             A dictionary with all attributes of Transfer Request
-        :retrun:
+        :return:
             A FakeResource object with volume_id, name, id.
         """
         # Set default attribute
@@ -207,7 +207,7 @@ class FakeService(object):
 
         :param Dictionary attrs:
             A dictionary with all attributes of service
-        :retrun:
+        :return:
             A FakeResource object with host, status, etc.
         """
         # Set default attribute
diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py
index ae4c9f51ea..eff0faf940 100644
--- a/openstackclient/tests/volume/v2/fakes.py
+++ b/openstackclient/tests/volume/v2/fakes.py
@@ -53,7 +53,7 @@ class FakeTransfer(object):
 
         :param Dictionary attrs:
             A dictionary with all attributes of Transfer Request
-        :retrun:
+        :return:
             A FakeResource object with volume_id, name, id.
         """
         # Set default attribute
@@ -103,7 +103,7 @@ class FakeService(object):
 
         :param Dictionary attrs:
             A dictionary with all attributes of service
-        :retrun:
+        :return:
             A FakeResource object with host, status, etc.
         """
         # Set default attribute
@@ -223,7 +223,7 @@ class FakeVolume(object):
 
         :param Dictionary attrs:
             A dictionary with all attributes of volume
-        :retrun:
+        :return:
             A FakeResource object with id, name, status, etc.
         """
         attrs = attrs or {}