diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py
index dce11d70160..988c552a383 100644
--- a/scripts/functional_tests.py
+++ b/scripts/functional_tests.py
@@ -80,7 +80,6 @@ def main():
                        tool_config_file=tool_config_file,
                        galaxy_data_manager_data_path=galaxy_data_manager_data_path,
                        update_integrated_tool_panel=False,
-                       cleanup_job='onsuccess',
                        enable_beta_tool_formats=True,
                        auto_configure_logging=logging_config_file is None,
                        data_manager_config_file=data_manager_config_file )
diff --git a/test/base/driver_util.py b/test/base/driver_util.py
index 953a829208f..a1286349095 100644
--- a/test/base/driver_util.py
+++ b/test/base/driver_util.py
@@ -123,6 +123,7 @@ def setup_galaxy_config(
         allow_user_deletion=True,
         api_allow_run_as='test@bx.psu.edu',
         check_migrate_tools=False,
+        cleanup_job='onsuccess',
         file_path=file_path,
         id_secret='changethisinproductiontoo',
         job_working_directory=job_working_directory,