diff --git a/openstackclient/api/compute_v2.py b/openstackclient/api/compute_v2.py
index 51b34482ea..0ffed65549 100644
--- a/openstackclient/api/compute_v2.py
+++ b/openstackclient/api/compute_v2.py
@@ -128,7 +128,7 @@ class APIv2(api.BaseAPI):
 
         https://developer.openstack.org/api-ref/compute/#delete-deallocate-floating-ip-address
 
-        :param string security_group:
+        :param string floating_ip_id:
             Floating IP ID
         """
 
diff --git a/openstackclient/tests/functional/base.py b/openstackclient/tests/functional/base.py
index 2d0706456b..d95f7f8465 100644
--- a/openstackclient/tests/functional/base.py
+++ b/openstackclient/tests/functional/base.py
@@ -48,7 +48,7 @@ def is_service_enabled(service):
         ret = execute('openstack service show -f value -c enabled ' + service)
     except exceptions.CommandFailed:
         # We get here for multiple reasons, all of them mean that a working
-        # service is not avilable
+        # service is not available
         return False
 
     return "True" in ret
@@ -69,7 +69,7 @@ class TestCase(testtools.TestCase):
         return cls.openstack('configuration show ' + opts)
 
     @classmethod
-    def get_openstack_extention_names(cls):
+    def get_openstack_extension_names(cls):
         opts = cls.get_opts(['Name'])
         return cls.openstack('extension list ' + opts)
 
diff --git a/openstackclient/tests/functional/network/v2/test_network_segment.py b/openstackclient/tests/functional/network/v2/test_network_segment.py
index de150d3106..7fc79746b9 100644
--- a/openstackclient/tests/functional/network/v2/test_network_segment.py
+++ b/openstackclient/tests/functional/network/v2/test_network_segment.py
@@ -37,7 +37,7 @@ class NetworkSegmentTests(common.NetworkTests):
             # NOTE(rtheis): The segment extension is not yet enabled
             #               by default.
             # Skip the tests if not enabled.
-            extensions = cls.get_openstack_extention_names()
+            extensions = cls.get_openstack_extension_names()
             if 'Segment' in extensions:
                 cls.NETWORK_SEGMENT_EXTENSION = 'Segment'
 
diff --git a/openstackclient/tests/functional/network/v2/test_subnet.py b/openstackclient/tests/functional/network/v2/test_subnet.py
index 5160042cda..93e0593d0d 100644
--- a/openstackclient/tests/functional/network/v2/test_subnet.py
+++ b/openstackclient/tests/functional/network/v2/test_subnet.py
@@ -278,6 +278,6 @@ class SubnetTests(common.NetworkTests):
                     raise
                 pass
             else:
-                # break and no longer retry if create sucessfully
+                # break and no longer retry if create successfully
                 break
         return cmd_output
diff --git a/openstackclient/tests/unit/compute/v2/fakes.py b/openstackclient/tests/unit/compute/v2/fakes.py
index e6af947684..d5fc9fa957 100644
--- a/openstackclient/tests/unit/compute/v2/fakes.py
+++ b/openstackclient/tests/unit/compute/v2/fakes.py
@@ -503,7 +503,7 @@ class FakeSecurityGroup(object):
         If security groups list is provided, then initialize the Mock object
         with the list. Otherwise create one.
 
-        :param List security groups:
+        :param List security_groups:
             A list of FakeResource objects faking security groups
         :param int count:
             The number of security groups to fake
@@ -1029,7 +1029,7 @@ class FakeFloatingIP(object):
         If floating_ips list is provided, then initialize the Mock object
         with the list. Otherwise create one.
 
-        :param List floating ips:
+        :param List floating_ips:
             A list of FakeResource objects faking floating ips
         :param int count:
             The number of floating ips to fake
diff --git a/openstackclient/tests/unit/image/v2/fakes.py b/openstackclient/tests/unit/image/v2/fakes.py
index 7f3f02df1f..7b2145873b 100644
--- a/openstackclient/tests/unit/image/v2/fakes.py
+++ b/openstackclient/tests/unit/image/v2/fakes.py
@@ -287,7 +287,7 @@ class FakeImage(object):
         """Create a fake image member.
 
         :param Dictionary attrs:
-            A dictionary with all attrbutes of image member
+            A dictionary with all attributes of image member
         :return:
             A FakeResource object with member_id, image_id and so on
         """
diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py
index 9a2899419c..e736b0fdd1 100644
--- a/openstackclient/tests/unit/network/v2/fakes.py
+++ b/openstackclient/tests/unit/network/v2/fakes.py
@@ -144,7 +144,7 @@ class FakeAddressScope(object):
         If address scopes list is provided, then initialize the Mock object
         with the list. Otherwise create one.
 
-        :param List address scopes:
+        :param List address_scopes:
             A list of FakeResource objects faking address scopes
         :param int count:
             The number of address scopes to fake
@@ -883,7 +883,7 @@ class FakeNetworkQosPolicy(object):
         If qos policies list is provided, then initialize the Mock object
         with the list. Otherwise create one.
 
-        :param List address scopes:
+        :param List qos_policies:
             A list of FakeResource objects faking qos policies
         :param int count:
             The number of QoS policies to fake
@@ -961,7 +961,7 @@ class FakeNetworkQosRule(object):
         If Network QoS rules list is provided, then initialize the Mock
         object with the list. Otherwise create one.
 
-        :param List address scopes:
+        :param List qos_rules:
             A list of FakeResource objects faking Network QoS rules
         :param int count:
             The number of QoS minimum bandwidth rules to fake
@@ -1161,7 +1161,7 @@ class FakeSecurityGroup(object):
         If security groups list is provided, then initialize the Mock object
         with the list. Otherwise create one.
 
-        :param List security groups:
+        :param List security_groups:
             A list of FakeResource objects faking security groups
         :param int count:
             The number of security groups to fake
@@ -1241,7 +1241,7 @@ class FakeSecurityGroupRule(object):
         If security group rules list is provided, then initialize the Mock
         object with the list. Otherwise create one.
 
-        :param List security group rules:
+        :param List security_group_rules:
             A list of FakeResource objects faking security group rules
         :param int count:
             The number of security group rules to fake
@@ -1406,7 +1406,7 @@ class FakeFloatingIP(object):
         If floating_ips list is provided, then initialize the Mock object
         with the list. Otherwise create one.
 
-        :param List floating ips:
+        :param List floating_ips:
             A list of FakeResource objects faking floating ips
         :param int count:
             The number of floating ips to fake
@@ -1585,7 +1585,7 @@ class FakeSubnetPool(object):
         If subnet_pools list is provided, then initialize the Mock object
         with the list. Otherwise create one.
 
-        :param List subnet pools:
+        :param List subnet_pools:
             A list of FakeResource objects faking subnet pools
         :param int count:
             The number of subnet pools to fake