diff --git a/test/functional/tools/data_manager.xml b/test/functional/tools/data_manager.xml
index 33261485299d..36891279dc41 100644
--- a/test/functional/tools/data_manager.xml
+++ b/test/functional/tools/data_manager.xml
@@ -2,13 +2,15 @@
     <configfiles>
         <configfile name="static_test_data">{"data_tables": {"testbeta": [{"value": "newvalue", "path": "newvalue.txt"}]}}</configfile>
     </configfiles>
-    <command>
+    <command detect_errors="exit_code">
         mkdir $out_file.files_path ;
-        echo "A new value" > $out_file.files_path/newvalue.txt;
-        cp $static_test_data $out_file
+        echo "A new value" > '$out_file.files_path/newvalue.txt';
+        cp '$static_test_data' '$out_file';
+        exit $exit_code
     </command>
     <inputs>
         <param type="text" name="ignored_value" value="" label="Ignored" />
+        <param type="integer" name="exit_code" value="0" label="Exit code"/>
     </inputs>
     <outputs>
         <data name="out_file" format="data_manager_json"/>
diff --git a/test/functional/tools/data_manager_add.xml b/test/functional/tools/data_manager_add.xml
index 3ab0dae4a8d3..6dcfd500d086 100644
--- a/test/functional/tools/data_manager_add.xml
+++ b/test/functional/tools/data_manager_add.xml
@@ -1,14 +1,16 @@
-<tool id="data_manager" name="Test Data Manager" tool_type="manage_data" version="0.0.1">
+<tool id="data_manager_add_test" name="Test Data Manager add" tool_type="manage_data" version="0.0.1">
     <configfiles>
         <configfile name="static_test_data">{"data_tables": {"testbeta": { "add": [{"value": "newvalue", "path": "newvalue.txt"}]}}}</configfile>
     </configfiles>
-    <command>
+    <command detect_errors="exit_code">
         mkdir $out_file.files_path ;
-        echo "A new value" > $out_file.files_path/newvalue.txt;
-        cp $static_test_data $out_file
+        echo "A new value" > '$out_file.files_path/newvalue.txt';
+        cp '$static_test_data' '$out_file';
+        exit $exit_code
     </command>
     <inputs>
         <param type="text" name="ignored_value" value="" label="Ignored" />
+        <param type="integer" name="exit_code" value="0" label="Exit code"/>
     </inputs>
     <outputs>
         <data name="out_file" format="data_manager_json"/>
diff --git a/test/functional/tools/data_manager_add_remove.xml b/test/functional/tools/data_manager_add_remove.xml
index 5dd69106926d..1ed984f02865 100644
--- a/test/functional/tools/data_manager_add_remove.xml
+++ b/test/functional/tools/data_manager_add_remove.xml
@@ -1,14 +1,16 @@
-<tool id="data_manager" name="Test Data Manager" tool_type="manage_data" version="0.0.1">
+<tool id="data_manager_add_remove_test" name="Test Data Manager add and remove" tool_type="manage_data" version="0.0.1">
     <configfiles>
         <configfile name="static_test_data">{"data_tables": {"testbeta": { "add": [{"value": "newvalue", "path": "newvalue.txt"}, {"value": "newvalue2", "path": "newvalue2.txt"}], "remove": [{"value": "newvalue", "path": "newvalue.txt"}]}}}</configfile>
     </configfiles>
-    <command>
+    <command detect_errors="exit_code">
         mkdir $out_file.files_path ;
-        echo "A new value" > $out_file.files_path/newvalue.txt;
-        cp $static_test_data $out_file
+        echo "A new value" > '$out_file.files_path/newvalue.txt';
+        cp '$static_test_data' '$out_file';
+        exit $exit_code
     </command>
     <inputs>
         <param type="text" name="ignored_value" value="" label="Ignored" />
+        <param type="integer" name="exit_code" value="0" label="Exit Code" />
     </inputs>
     <outputs>
         <data name="out_file" format="data_manager_json"/>