diff --git a/sahara/cli/image_pack/cli.py b/sahara/cli/image_pack/cli.py
index 43729374db..25ed017d2c 100644
--- a/sahara/cli/image_pack/cli.py
+++ b/sahara/cli/image_pack/cli.py
@@ -36,7 +36,7 @@ CONF.register_cli_opts([
         'root-filesystem',
         dest='root_fs',
         required=False,
-        help=_("The filesystem to mount as the root volume on the image. No"
+        help=_("The filesystem to mount as the root volume on the image. No "
                "value is required if only one filesystem is detected.")),
     cfg.BoolOpt(
         'test-only',
diff --git a/sahara/service/health/common.py b/sahara/service/health/common.py
index 62a0288bc1..26751c4bf6 100644
--- a/sahara/service/health/common.py
+++ b/sahara/service/health/common.py
@@ -37,7 +37,7 @@ health_opts = [
     cfg.BoolOpt('verification_enable', default=True,
                 help="Option to enable verifications for all clusters"),
     cfg.IntOpt('verification_periodic_interval', default=600,
-               help="Interval between two consecutive periodic tasks for"
+               help="Interval between two consecutive periodic tasks for "
                     "verifications, in seconds."),
     cfg.IntOpt('verification_timeout', default=600,
                help="Time limit for health check function, in seconds.")
diff --git a/sahara/service/validations/shares.py b/sahara/service/validations/shares.py
index 2e21d81ffd..7de6a1290f 100644
--- a/sahara/service/validations/shares.py
+++ b/sahara/service/validations/shares.py
@@ -58,7 +58,7 @@ def check_shares(data):
     for path in paths:
         if not path.startswith('/') or '\x00' in path:
             raise ex.InvalidDataException(
-                _('Paths must be absolute Linux paths starting with "/"'
+                _('Paths must be absolute Linux paths starting with "/" '
                   'and may not contain nulls.'))
 
     client = manila.client()
diff --git a/sahara/tests/unit/service/validation/test_share_validations.py b/sahara/tests/unit/service/validation/test_share_validations.py
index f429617068..88a07dae8a 100644
--- a/sahara/tests/unit/service/validation/test_share_validations.py
+++ b/sahara/tests/unit/service/validation/test_share_validations.py
@@ -110,7 +110,7 @@ class TestShareValidations(u.ValidationTestCase):
                 }],
             bad_req_i=(
                 1, 'INVALID_DATA',
-                'Paths must be absolute Linux paths starting with "/"'
+                'Paths must be absolute Linux paths starting with "/" '
                 'and may not contain nulls.'))
 
         self._assert_create_object_validation(
@@ -121,7 +121,7 @@ class TestShareValidations(u.ValidationTestCase):
                 }],
             bad_req_i=(
                 1, 'INVALID_DATA',
-                'Paths must be absolute Linux paths starting with "/"'
+                'Paths must be absolute Linux paths starting with "/" '
                 'and may not contain nulls.'))
 
         self.assertEqual(0, f_client.call_count)
diff --git a/sahara/tests/unit/utils/test_ssh_remote.py b/sahara/tests/unit/utils/test_ssh_remote.py
index 675bdfe52f..5846fdbcaa 100644
--- a/sahara/tests/unit/utils/test_ssh_remote.py
+++ b/sahara/tests/unit/utils/test_ssh_remote.py
@@ -455,7 +455,7 @@ class TestInstanceInteropHelper(base.SaharaTestCase):
         instance = FakeInstance('inst13', '123',
                                 '10.0.0.13', '10.0.0.13', 'user13', 'key13')
         remote = ssh_remote.InstanceInteropHelper(instance)
-        description = ('In file "file" replacing line begining with string'
+        description = ('In file "file" replacing line begining with string '
                        '"str" with "newline"')
 
         remote.replace_remote_line("file", "str", "newline")
diff --git a/sahara/utils/ssh_remote.py b/sahara/utils/ssh_remote.py
index f93a7bdc2d..c03dbf2c10 100644
--- a/sahara/utils/ssh_remote.py
+++ b/sahara/utils/ssh_remote.py
@@ -919,7 +919,7 @@ class InstanceInteropHelper(remote.Remote):
                             old_line_with_start_string,
                             new_line, timeout=None):
         description = _('In file "%(file)s" replacing line'
-                        ' begining with string'
+                        ' begining with string '
                         '"%(old_line_with_start_string)s"'
                         ' with "%(new_line)s"') % {
             "file": remote_file,