diff --git a/lib/galaxy_test/api/test_tool_execute.py b/lib/galaxy_test/api/test_tool_execute.py
index 322383b4d55..a701ad3dc1d 100644
--- a/lib/galaxy_test/api/test_tool_execute.py
+++ b/lib/galaxy_test/api/test_tool_execute.py
@@ -256,7 +256,7 @@ def test_map_over_empty_collection(target_history: TargetHistory, required_tool:
     assert "on collection 1" in name
 
 
-@requires_tool_id("collection_mapped_over_empty_structured_like")
+@requires_tool_id("collection_paired_structured_like_with_data_input")
 def test_map_over_empty_with_structured_like_non_mapped_collection_input(
     target_history: TargetHistory, required_tool: RequiredTool
 ):
diff --git a/test/functional/tools/collection_mapped_over_empty_structured_like.xml b/test/functional/tools/collection_paired_structured_like_with_data_input.xml
similarity index 80%
rename from test/functional/tools/collection_mapped_over_empty_structured_like.xml
rename to test/functional/tools/collection_paired_structured_like_with_data_input.xml
index 96ef08d70b8..23a6647a439 100644
--- a/test/functional/tools/collection_mapped_over_empty_structured_like.xml
+++ b/test/functional/tools/collection_paired_structured_like_with_data_input.xml
@@ -1,4 +1,4 @@
-<tool id="collection_mapped_over_empty_structured_like" name="collection_mapped_over_empty_structured_like" version="0.1.0">
+<tool id="collection_paired_structured_like_with_data_input" name="collection_paired_structured_like_with_data_input" version="0.1.0">
   <command><![CDATA[
         cat '$input1' '${shape.forward}' '${shape.reverse}' > '${list_output.forward}';
         cat '$input1' '${shape.reverse}' '${shape.forward}' > '${list_output.reverse}'
diff --git a/test/functional/tools/sample_tool_conf.xml b/test/functional/tools/sample_tool_conf.xml
index 1603b0c792c..c0007c28403 100644
--- a/test/functional/tools/sample_tool_conf.xml
+++ b/test/functional/tools/sample_tool_conf.xml
@@ -189,7 +189,7 @@
   <tool file="collection_paired_default.xml" />
   <tool file="collection_paired_structured_like.xml" />
   <tool file="collection_paired_conditional_structured_like.xml" />
-  <tool file="collection_mapped_over_empty_structured_like.xml" />
+  <tool file="collection_paired_structured_like_with_data_input.xml" />
   <tool file="collection_nested_test.xml" />
   <tool file="collection_nested_default.xml" />
   <tool file="collection_mixed_param.xml" />
diff --git a/test/integration/test_structured_like_unpopulated.py b/test/integration/test_structured_like_unpopulated.py
index 3f72121574d..e3e2a560df2 100644
--- a/test/integration/test_structured_like_unpopulated.py
+++ b/test/integration/test_structured_like_unpopulated.py
@@ -75,7 +75,7 @@ class TestStructuredLikeUnpopulatedRaisesNotReady(integration_util.IntegrationTe
                 "shape": {"src": "hdca", "id": shape_hdca["id"]},
             }
             response = self.dataset_populator.run_tool_raw(
-                tool_id="collection_mapped_over_empty_structured_like",
+                tool_id="collection_paired_structured_like_with_data_input",
                 inputs=inputs,
                 history_id=history_id,
             )