diff --git a/functional/tests/compute/v2/test_agent.py b/functional/tests/compute/v2/test_agent.py
index df7c21f264..2d7ea21615 100644
--- a/functional/tests/compute/v2/test_agent.py
+++ b/functional/tests/compute/v2/test_agent.py
@@ -16,7 +16,7 @@ from functional.common import test
 
 
 class ComputeAgentTests(test.TestCase):
-    """Functional tests for compute agent. """
+    """Functional tests for compute agent."""
 
     ID = None
     MD5HASH = hashlib.md5().hexdigest()
@@ -32,11 +32,11 @@ class ComputeAgentTests(test.TestCase):
     @classmethod
     def setUpClass(cls):
         opts = cls.get_show_opts(cls.HEADERS)
-        raw_output = cls.openstack('compute agent create '
-                                   + cls.OS + ' ' + cls.ARCH + ' '
-                                   + cls.VER + ' ' + cls.URL + ' '
-                                   + cls.MD5HASH + ' ' + cls.HYPER + ' '
-                                   + opts)
+        raw_output = cls.openstack('compute agent create ' +
+                                   cls.OS + ' ' + cls.ARCH + ' ' +
+                                   cls.VER + ' ' + cls.URL + ' ' +
+                                   cls.MD5HASH + ' ' + cls.HYPER + ' ' +
+                                   opts)
 
         # Get agent id because agent can only be deleted by ID
         output_list = raw_output.split('\n', 1)
@@ -64,9 +64,9 @@ class ComputeAgentTests(test.TestCase):
         url = "http://openstack"
         md5hash = hashlib.md5().hexdigest()
 
-        raw_output = self.openstack('compute agent set '
-                                    + self.ID + ' ' + ver + ' '
-                                    + url + ' ' + md5hash)
+        raw_output = self.openstack('compute agent set ' +
+                                    self.ID + ' ' + ver + ' ' +
+                                    url + ' ' + md5hash)
         self.assertEqual('', raw_output)
 
         raw_output = self.openstack('compute agent list')
diff --git a/functional/tests/compute/v2/test_aggregate.py b/functional/tests/compute/v2/test_aggregate.py
index 2ad6559904..5bac585841 100644
--- a/functional/tests/compute/v2/test_aggregate.py
+++ b/functional/tests/compute/v2/test_aggregate.py
@@ -16,7 +16,7 @@ from functional.common import test
 
 
 class AggregateTests(test.TestCase):
-    """Functional tests for aggregate. """
+    """Functional tests for aggregate."""
 
     NAME = uuid.uuid4().hex
     HEADERS = ['Name']
diff --git a/functional/tests/compute/v2/test_flavor.py b/functional/tests/compute/v2/test_flavor.py
index d1f5f95dd4..2bb075bd59 100644
--- a/functional/tests/compute/v2/test_flavor.py
+++ b/functional/tests/compute/v2/test_flavor.py
@@ -16,7 +16,7 @@ from functional.common import test
 
 
 class FlavorTests(test.TestCase):
-    """Functional tests for flavor. """
+    """Functional tests for flavor."""
 
     NAME = uuid.uuid4().hex
     HEADERS = ['Name']
diff --git a/functional/tests/compute/v2/test_server_group.py b/functional/tests/compute/v2/test_server_group.py
index ce4f97a67b..c073b88e99 100644
--- a/functional/tests/compute/v2/test_server_group.py
+++ b/functional/tests/compute/v2/test_server_group.py
@@ -16,7 +16,7 @@ from functional.common import test
 
 
 class ServerGroupTests(test.TestCase):
-    """Functional tests for servergroup. """
+    """Functional tests for servergroup."""
 
     NAME = uuid.uuid4().hex
     HEADERS = ['Name']