diff --git a/test/functional/tools/strict_shell.xml b/test/functional/tools/strict_shell.xml
index 0a6adab9ae29..2b4a95f83ce5 100644
--- a/test/functional/tools/strict_shell.xml
+++ b/test/functional/tools/strict_shell.xml
@@ -1,6 +1,8 @@
 <tool id="strict_shell" name="strict_shell" version="1.0.0">
     <command strict="true" detect_errors="exit_code"><![CDATA[
-echo "Hello" > '$out_file1';
+#if $exit_code == "0"
+    echo "Hello" > '$out_file1';
+#end if
 sh -c 'exit $exit_code';
 sh -c 'exit 0'
     ]]></command>
diff --git a/test/functional/tools/strict_shell_default_off.xml b/test/functional/tools/strict_shell_default_off.xml
index aca66494dc7c..4ad21bd0d268 100644
--- a/test/functional/tools/strict_shell_default_off.xml
+++ b/test/functional/tools/strict_shell_default_off.xml
@@ -1,8 +1,10 @@
 <tool id="strict_shell_default_off" name="strict_shell_default_off" version="1.0.0">
     <command detect_errors="exit_code"><![CDATA[
-echo 'Hello' > '$out_file1'
-; sh -c 'exit $exit_code'
-; sh -c 'exit 0'
+#if $exit_code == "0"
+    echo 'Hello' > '$out_file1';
+#end if
+sh -c 'exit $exit_code';
+sh -c 'exit 0'
     ]]></command>
     <inputs>
         <param name="exit_code" type="integer" value="0" label="exit code"/>
diff --git a/test/functional/tools/strict_shell_profile.xml b/test/functional/tools/strict_shell_profile.xml
index 726e9d5a9fe0..57da2286578e 100644
--- a/test/functional/tools/strict_shell_profile.xml
+++ b/test/functional/tools/strict_shell_profile.xml
@@ -1,8 +1,10 @@
 <tool id="strict_shell_profile" name="strict_shell_profile" version="1.0.0" profile="20.09">
     <command detect_errors="exit_code"><![CDATA[
-echo 'Hello' > '$out_file1'
-; sh -c 'exit $exit_code'
-; sh -c 'exit 0'
+#if $exit_code == 0
+    echo 'Hello' > '$out_file1';
+#end if
+sh -c 'exit $exit_code';
+sh -c 'exit 0'
     ]]></command>
     <inputs>
         <param name="exit_code" type="integer" value="0" label="exit code"/>
diff --git a/test/integration/test_job_outputs_to_working_directory.py b/test/integration/test_job_outputs_to_working_directory.py
index 9ced6c5e35cd..97ea525a8e15 100644
--- a/test/integration/test_job_outputs_to_working_directory.py
+++ b/test/integration/test_job_outputs_to_working_directory.py
@@ -17,5 +17,5 @@ def handle_galaxy_config_kwds(cls, config):
 instance = integration_util.integration_module_instance(JobOutputsToWorkingDirectoryIntegrationInstance)
 
 test_tools = integration_util.integration_tool_runner(
-    ["output_format", "output_empty_work_dir", "collection_creates_pair_from_work_dir"]
+    ["output_format", "output_empty_work_dir", "collection_creates_pair_from_work_dir", "strict_shell_profile"]
 )