diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index 2ce6a32142a..aa6b9209f63 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -646,7 +646,7 @@ steps:
 inputs: []
 steps:
   - tool_id: multiple_versions
-    tool_version: 0.1
+    tool_version: "0.1"
     label: multiple_versions
     state:
       foo: bar
@@ -780,7 +780,7 @@ inputs: []
 steps:
   - tool_id: create_2
     label: create_2
-    outputs:
+    out:
       out_file1:
         change_datatype: bam
   - tool_id: metadata_bam
@@ -807,7 +807,7 @@ steps:
         steps:
           - tool_id: create_2
             label: create_2
-            outputs:
+            out:
               out_file1:
                 change_datatype: bam
         outputs:
@@ -906,7 +906,7 @@ inputs:
     collection_type: "list"
 steps:
   - tool_id: multiple_versions
-    tool_version: 0.1
+    tool_version: "0.1"
     label: multiple_versions
     state:
       foo: bar
diff --git a/lib/galaxy_test/workflow/map_over_expression.gxwf.yml b/lib/galaxy_test/workflow/map_over_expression.gxwf.yml
index c361b223202..14319d86020 100644
--- a/lib/galaxy_test/workflow/map_over_expression.gxwf.yml
+++ b/lib/galaxy_test/workflow/map_over_expression.gxwf.yml
@@ -13,6 +13,3 @@ steps:
     tool_id: validation_default
     in:
       input1: param_out/text_param
-    outputs:
-      out_file1:
-        rename: "replaced_param_collection"
diff --git a/lib/galaxy_test/workflow/optional_param_default_value.gxwf.yml b/lib/galaxy_test/workflow/optional_param_default_value.gxwf.yml
index c2d70a4a012..d25392f4412 100644
--- a/lib/galaxy_test/workflow/optional_param_default_value.gxwf.yml
+++ b/lib/galaxy_test/workflow/optional_param_default_value.gxwf.yml
@@ -19,6 +19,6 @@ steps:
     in:
       input1:
         source: required_input
-    outputs:
+    out:
       out_file1:
         rename: "prefix_${optional_text}_suffix"
diff --git a/lib/galaxy_test/workflow/rename_based_on_input_collection.gxwf.yml b/lib/galaxy_test/workflow/rename_based_on_input_collection.gxwf.yml
index 0d6a19abfdd..688acbfb5eb 100644
--- a/lib/galaxy_test/workflow/rename_based_on_input_collection.gxwf.yml
+++ b/lib/galaxy_test/workflow/rename_based_on_input_collection.gxwf.yml
@@ -15,6 +15,6 @@ steps:
           $link: fastq_inputs
       reference:
         $link: fasta_input
-    outputs:
+    out:
       out_file1:
         rename: "#{fastq_input.fastq_input1 | basename} suffix"
diff --git a/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf.yml b/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf.yml
index 834721c3cc2..62d62c82a48 100644
--- a/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf.yml
+++ b/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf.yml
@@ -10,7 +10,7 @@ steps:
     tool_id: create_2
     state:
       sleep_time: 0
-    outputs:
+    out:
       out_file1:
         rename: "${replaceme} name"
       out_file2:
diff --git a/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf.yml b/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf.yml
index d783195ae58..28b39090617 100644
--- a/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf.yml
+++ b/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf.yml
@@ -22,7 +22,7 @@ steps:
           tool_id: create_2
           state:
             sleep_time: 0
-          outputs:
+          out:
             out_file1:
               rename: "${replacemeinner} name"
             out_file2:
diff --git a/lib/galaxy_test/workflow/replacement_parameters_text.gxwf.yml b/lib/galaxy_test/workflow/replacement_parameters_text.gxwf.yml
index 18f73aadb69..b57393613b2 100644
--- a/lib/galaxy_test/workflow/replacement_parameters_text.gxwf.yml
+++ b/lib/galaxy_test/workflow/replacement_parameters_text.gxwf.yml
@@ -11,7 +11,7 @@ steps:
     tool_id: create_2
     state:
       sleep_time: 0
-    outputs:
+    out:
       out_file1:
         rename: "${replaceme} name"
       out_file2:
diff --git a/test/integration/test_workflow_refactoring.py b/test/integration/test_workflow_refactoring.py
index b3633228f20..8b626ab22e7 100644
--- a/test/integration/test_workflow_refactoring.py
+++ b/test/integration/test_workflow_refactoring.py
@@ -444,7 +444,7 @@ steps:
     tool_id: cat
     in:
       input1: test_input
-    outputs:
+    out:
       out_file1:
         rename: "${pja_only_param} name"
 """)
@@ -465,7 +465,7 @@ steps:
     tool_id: cat
     in:
       input1: test_input
-    outputs:
+    out:
       out_file1:
         rename: "${pja_only_param} name"
 """)
@@ -489,7 +489,7 @@ steps:
     tool_id: cat
     in:
       input1: test_input
-    outputs:
+    out:
       out_file1:
         rename: "${pja_only_param} name"
 """)