diff --git a/lib/galaxy/model/dataset_collections/types/collection_semantics.yml b/lib/galaxy/model/dataset_collections/types/collection_semantics.yml
index b4bfbff4e9e..9de9c8406ce 100644
--- a/lib/galaxy/model/dataset_collections/types/collection_semantics.yml
+++ b/lib/galaxy/model/dataset_collections/types/collection_semantics.yml
@@ -882,7 +882,7 @@
         tool_runtime:
             api_test: "test_tool_execute.py::test_map_over_paired_or_unpaired_with_list"
         workflow_runtime:
-            framework_test: "collection_semantics_paired_or_unpaired_4"
+            framework_test: "collection_semantics_paired_or_unpaired_7"
         workflow_editor: "accepts list -> paired_or_unpaired connection"
 
 - doc: |
@@ -1129,6 +1129,10 @@
                         invocation: {inputs: {i: {type: collection, ref: C_AS_UNPAIRED_n}}}
                         output: o
     tests:
+        tool_runtime:
+            api_test: "test_tool_execute.py::test_map_over_paired_or_unpaired_with_sample_sheet"
+        workflow_runtime:
+            framework_test: "collection_semantics_paired_or_unpaired_8"
         workflow_editor: "accepts sample_sheet -> paired_or_unpaired connection"
 
 - example:
diff --git a/lib/galaxy_test/workflow/collection_semantics_paired_or_unpaired.gxwf-tests.yml b/lib/galaxy_test/workflow/collection_semantics_paired_or_unpaired.gxwf-tests.yml
index cb3a59908ff..c7658405026 100644
--- a/lib/galaxy_test/workflow/collection_semantics_paired_or_unpaired.gxwf-tests.yml
+++ b/lib/galaxy_test/workflow/collection_semantics_paired_or_unpaired.gxwf-tests.yml
@@ -93,8 +93,8 @@
       collection_type: list:list
 
 - doc: |
-    MAPPING_LIST_OVER_PAIRED_OR_UNPAIRED: A list:paired_or_unpaired collection mapped over
-    a paired_or_unpaired tool input produces a list output collection.
+    MAPPING_LIST_PAIRED_OR_UNPAIRED_OVER_PAIRED_OR_UNPAIRED: A list:paired_or_unpaired
+    collection mapped over a paired_or_unpaired tool input produces a list output collection.
   job:
     input1:
       class: Collection
@@ -164,3 +164,44 @@
     wf_output:
       class: Collection
       collection_type: sample_sheet
+
+- doc: |
+    MAPPING_LIST_OVER_PAIRED_OR_UNPAIRED: A flat list mapped over a
+    paired_or_unpaired tool input via single_datasets produces a list output.
+  job:
+    input1:
+      class: Collection
+      collection_type: list
+      elements:
+        - identifier: el1
+          class: File
+          contents: "element 1"
+        - identifier: el2
+          class: File
+          contents: "element 2"
+  outputs:
+    wf_output:
+      class: Collection
+      collection_type: list
+
+- doc: |
+    SAMPLE_SHEET_MAPPING_OVER_PAIRED_OR_UNPAIRED: A flat sample_sheet mapped over
+    a paired_or_unpaired tool input via single_datasets produces a sample_sheet output.
+  job:
+    input1:
+      class: Collection
+      collection_type: sample_sheet
+      rows:
+        el1: []
+        el2: []
+      elements:
+        - identifier: el1
+          class: File
+          contents: "element 1"
+        - identifier: el2
+          class: File
+          contents: "element 2"
+  outputs:
+    wf_output:
+      class: Collection
+      collection_type: sample_sheet