diff --git a/sahara/plugins/spark/config_helper.py b/sahara/plugins/spark/config_helper.py
index 6ff2647a5e..a1b8d2c11e 100644
--- a/sahara/plugins/spark/config_helper.py
+++ b/sahara/plugins/spark/config_helper.py
@@ -371,7 +371,7 @@ def generate_spark_env_configs(cluster):
     return '\n'.join(configs)
 
 
-# workernames need to be a list of woker names
+# workernames need to be a list of worker names
 def generate_spark_slaves_configs(workernames):
     return '\n'.join(workernames)
 
diff --git a/sahara/service/shares.py b/sahara/service/shares.py
index 1fd8430dd2..a3221bbe50 100644
--- a/sahara/service/shares.py
+++ b/sahara/service/shares.py
@@ -255,7 +255,7 @@ class _NFSMounter(_ShareHandler):
         remote.execute_command(mount_command, run_as_root=True)
 
     def unmount_from_instance(self, remote, share_info):
-        """Unounts the share from the instance."""
+        """Unmounts the share from the instance."""
         local_path = self._get_path(share_info)
 
         unmount_command = self._UNMOUNT_COMMAND % local_path
diff --git a/sahara/tests/unit/conductor/manager/test_edp.py b/sahara/tests/unit/conductor/manager/test_edp.py
index c977ab1ce7..0e471f09ac 100644
--- a/sahara/tests/unit/conductor/manager/test_edp.py
+++ b/sahara/tests/unit/conductor/manager/test_edp.py
@@ -543,7 +543,7 @@ class JobExecutionTest(test_base.ConductorManagerTestCase):
         my_sample_job_exec['info'] = {'status': 'KiLLeD'}
         self.api.job_execution_create(ctx, my_sample_job_exec)
 
-        # Search only with job exeuction fields (finds both)
+        # Search only with job execution fields (finds both)
         lst = self.api.job_execution_get_all(ctx, **{'return_code': 1})
         self.assertEqual(2, len(lst))
 
diff --git a/sahara/tests/unit/plugins/spark/test_config_helper.py b/sahara/tests/unit/plugins/spark/test_config_helper.py
index 793056a143..9b2d8bf644 100644
--- a/sahara/tests/unit/plugins/spark/test_config_helper.py
+++ b/sahara/tests/unit/plugins/spark/test_config_helper.py
@@ -87,7 +87,7 @@ class ConfigHelperUtilsTest(test_base.SaharaTestCase):
         mod_swift_vals['fs.swift.service.sahara.tenant'] = 'fred'
         self.assertDictContainsSubset(mod_swift_vals, properties)
 
-        # Make sure that swift confgs are left out if not enabled
+        # Make sure that swift configs are left out if not enabled
         c = c_helper.generate_xml_configs(
             {'HDFS': {'fs.swift.service.sahara.tenant': 'fred'},
              'general': {'Enable Swift': False}},