diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index 6fc213cdc5e3..60f6889cfa63 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -2800,35 +2800,6 @@ def run_test(workflow_text):
 
         run_test(NESTED_WORKFLOW_AUTO_LABELS_MODERN_SYNTAX)
 
-    @skip_without_tool("collection_paired_test")
-    def test_workflow_flatten(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._run_jobs(
-                """
-class: GalaxyWorkflow
-steps:
-  nested:
-    tool_id: collection_creates_dynamic_nested
-    state:
-      sleep_time: 0
-      foo: 'dummy'
-  flatten:
-    tool_id: '__FLATTEN__'
-    state:
-      input:
-        $link: nested/list_output
-      join_identifier: '-'
-""",
-                test_data={},
-                history_id=history_id,
-            )
-            details = self.dataset_populator.get_history_collection_details(history_id, hid=14)
-            assert details["collection_type"] == "list"
-            elements = details["elements"]
-            identifiers = [e["element_identifier"] for e in elements]
-            assert len(identifiers) == 6
-            assert "oe1-ie1" in identifiers
-
     @skip_without_tool("collection_paired_test")
     def test_workflow_flatten_with_mapped_over_execution(self):
         with self.dataset_populator.test_history() as history_id:
diff --git a/lib/galaxy_test/workflow/flatten_collection.gxwf-tests.yml b/lib/galaxy_test/workflow/flatten_collection.gxwf-tests.yml
new file mode 100644
index 000000000000..1a2b5c65b596
--- /dev/null
+++ b/lib/galaxy_test/workflow/flatten_collection.gxwf-tests.yml
@@ -0,0 +1,18 @@
+- doc: | 
+    Test to verify collection flatten collection operation in the context of a workflow.
+  job: {}
+  outputs:
+    out:
+      elements:
+        'oe1-ie1':
+          asserts:
+          - that: has_text
+            text: "A"
+        'oe1-ie2':
+          asserts:
+          - that: has_text
+            text: "B"
+        'oe2-ie1':
+          asserts:
+          - that: has_text
+            text: "C"
diff --git a/lib/galaxy_test/workflow/flatten_collection.gxwf.yml b/lib/galaxy_test/workflow/flatten_collection.gxwf.yml
new file mode 100644
index 000000000000..993bd9dac005
--- /dev/null
+++ b/lib/galaxy_test/workflow/flatten_collection.gxwf.yml
@@ -0,0 +1,17 @@
+class: GalaxyWorkflow
+inputs: {}
+outputs:
+  out:
+    outputSource: flatten/output
+steps:
+  nested:
+    tool_id: collection_creates_dynamic_nested
+    state:
+      sleep_time: 0
+      foo: 'dummy'
+  flatten:
+    tool_id: '__FLATTEN__'
+    state:
+      join_identifier: '-'
+    in:
+      input: nested/list_output