diff --git a/test/api/test_workflows.py b/test/api/test_workflows.py
index c0162be0883..4b8c481043e 100644
--- a/test/api/test_workflows.py
+++ b/test/api/test_workflows.py
@@ -1355,6 +1355,29 @@ test_data:
         name = content["name"]
         assert name == "my new name", name
 
+    @skip_without_tool("create_2")
+    def test_run_rename_multiple_outputs(self):
+        with self.dataset_populator.test_history() as history_id:
+            self._run_jobs("""
+class: GalaxyWorkflow
+inputs: []
+steps:
+  - tool_id: create_2
+    state:
+      sleep_time: 0
+    outputs:
+      out_file1:
+        rename: "my new name"
+      out_file2:
+        rename: "my other new name"
+test_data: {}
+""", history_id=history_id)
+        details1 = self.dataset_populator.get_history_dataset_details(history_id, hid=1, wait=True, assert_ok=True)
+        details2 = self.dataset_populator.get_history_dataset_details(history_id, hid=2)
+
+        assert details1["name"] == "my new name"
+        assert details2["name"] == "my other new name"
+
     @skip_without_tool("cat")
     def test_run_rename_based_on_input(self):
         history_id = self.dataset_populator.new_history()
diff --git a/test/functional/tools/create_2.xml b/test/functional/tools/create_2.xml
index f9827846f64..f04bab7f4a9 100644
--- a/test/functional/tools/create_2.xml
+++ b/test/functional/tools/create_2.xml
@@ -1,5 +1,5 @@
 <tool id="create_2" name="create_2">
-    <command><![CDATA[
+    <command detect_errors="exit_code"><![CDATA[
         echo "1" > '$out_file1';
         echo "2" > '$out_file2';
         sleep '$sleep_time';