diff --git a/test/unit/jobs/test_job_wrapper.py b/test/unit/jobs/test_job_wrapper.py
index 2e73be47fb0..8a0311ca8ff 100644
--- a/test/unit/jobs/test_job_wrapper.py
+++ b/test/unit/jobs/test_job_wrapper.py
@@ -12,9 +12,6 @@ from galaxy.util.bunch import Bunch
 from galaxy.tools import evaluation
 
 from tools_support import UsesApp
-# from tools_support import MockTool
-
-# from ..tools_and_jobs_helpers import MockApp
 
 TEST_TOOL_ID = "cufftest"
 TEST_VERSION_COMMAND = "bwa --version"
@@ -123,26 +120,6 @@ class MockJobDispatcher(object):
         pass
 
 
-class MockApp(object):
-
-    def __init__(self, object_store, test_directory, model_objects):
-        self.object_store = object_store
-        self.toolbox = MockToolbox(MockTool(self))
-        self.config = Bunch(
-            outputs_to_working_directory=False,
-            new_file_path=os.path.join(test_directory, "new_files"),
-            tool_data_path=os.path.join(test_directory, "tools"),
-            root=os.path.join(test_directory, "galaxy"),
-            datatypes_registry=Bunch(
-                integrated_datatypes_configs=os.path.join(test_directory, "datatypes_conf.xml"),
-            ),
-        )
-        self.job_config = Bunch(
-            dynamic_params=None,
-        )
-        self.model = Bunch(context=MockContext(model_objects))
-
-
 class MockContext(object):
 
     def __init__(self, model_objects):
diff --git a/test/unit/tools_support.py b/test/unit/tools_support.py
index 0249cb2bf88..d1d77e00fda 100644
--- a/test/unit/tools_support.py
+++ b/test/unit/tools_support.py
@@ -106,6 +106,7 @@ class MockApp( object ):
 
         self.config = Bunch(
             outputs_to_working_directory=False,
+            commands_in_new_shell=True,
             new_file_path=os.path.join(test_directory, "new_files"),
             tool_data_path=os.path.join(test_directory, "tools"),
             root=os.path.join(test_directory, "galaxy"),