diff --git a/lib/galaxy/jobs/runners/util/cli/__init__.py b/lib/galaxy/jobs/runners/util/cli/__init__.py
index c38bb878ff6..8aecd72f5c3 100644
--- a/lib/galaxy/jobs/runners/util/cli/__init__.py
+++ b/lib/galaxy/jobs/runners/util/cli/__init__.py
@@ -82,15 +82,13 @@ class CliInterface:
         return self.active_cli_shells[requested_shell_settings]
 
     def get_job_interface(self, job_params):
-        job_plugin = job_params.get('plugin', None)
+        job_plugin = job_params.get('plugin')
         if not job_plugin:
             raise ValueError(ERROR_MESSAGE_NO_JOB_PLUGIN)
-        job_plugin_class = self.cli_job_interfaces.get(job_plugin, None)
+        job_plugin_class = self.cli_job_interfaces.get(job_plugin)
         if not job_plugin_class:
             raise ValueError(ERROR_MESSAGE_NO_SUCH_JOB_PLUGIN % (job_plugin, list(self.cli_job_interfaces.keys())))
-        job_interface = job_plugin_class(**job_params)
-
-        return job_interface
+        return job_plugin_class(**job_params)
 
 
 def split_params(params):
diff --git a/lib/galaxy/jobs/runners/util/cli/job/__init__.py b/lib/galaxy/jobs/runners/util/cli/job/__init__.py
index ea5c862c95a..73d3f0b53e3 100644
--- a/lib/galaxy/jobs/runners/util/cli/job/__init__.py
+++ b/lib/galaxy/jobs/runners/util/cli/job/__init__.py
@@ -22,11 +22,11 @@ except ImportError:
 
 class BaseJobExec(metaclass=ABCMeta):
 
-    @abstractmethod
     def __init__(self, **params):
         """
         Constructor for CLI job executor.
         """
+        self.params = params.copy()
 
     def job_script_kwargs(self, ofile, efile, job_name):
         """ Return extra keyword argument for consumption by job script
diff --git a/lib/galaxy/jobs/runners/util/cli/job/lsf.py b/lib/galaxy/jobs/runners/util/cli/job/lsf.py
index a3ad27e123c..a1e871b732d 100644
--- a/lib/galaxy/jobs/runners/util/cli/job/lsf.py
+++ b/lib/galaxy/jobs/runners/util/cli/job/lsf.py
@@ -19,11 +19,6 @@ argmap = {
 
 class LSF(BaseJobExec):
 
-    def __init__(self, **params):
-        self.params = {}
-        for k, v in params.items():
-            self.params[k] = v
-
     def job_script_kwargs(self, ofile, efile, job_name):
         scriptargs = {'-o': ofile,
                       '-e': efile,
diff --git a/lib/galaxy/jobs/runners/util/cli/job/slurm.py b/lib/galaxy/jobs/runners/util/cli/job/slurm.py
index d87479b513d..9ae10295ace 100644
--- a/lib/galaxy/jobs/runners/util/cli/job/slurm.py
+++ b/lib/galaxy/jobs/runners/util/cli/job/slurm.py
@@ -15,11 +15,6 @@ argmap = {
 
 class Slurm(BaseJobExec):
 
-    def __init__(self, **params):
-        self.params = {}
-        for k, v in params.items():
-            self.params[k] = v
-
     def job_script_kwargs(self, ofile, efile, job_name):
         scriptargs = {'-o': ofile,
                       '-e': efile,
diff --git a/lib/galaxy/jobs/runners/util/cli/job/torque.py b/lib/galaxy/jobs/runners/util/cli/job/torque.py
index e369afab390..855519f8f8c 100644
--- a/lib/galaxy/jobs/runners/util/cli/job/torque.py
+++ b/lib/galaxy/jobs/runners/util/cli/job/torque.py
@@ -31,11 +31,6 @@ argmap = {'destination': '-q',
 
 class Torque(BaseJobExec):
 
-    def __init__(self, **params):
-        self.params = {}
-        for k, v in params.items():
-            self.params[k] = v
-
     def job_script_kwargs(self, ofile, efile, job_name):
         pbsargs = {'-o': ofile,
                    '-e': efile,