diff --git a/test/api/test_tools.py b/test/api/test_tools.py
index eb3a0808525..82e310b06a9 100644
--- a/test/api/test_tools.py
+++ b/test/api/test_tools.py
@@ -827,7 +827,7 @@ class ToolsTestCase( api.ApiTestCase ):
         }
 
         self.dataset_populator.wait_for_history( history_id, assert_ok=True )
-        create_response = self._run( "identifier_conditional", history_id, inputs )
+        create_response = self._run( "identifier_collection", history_id, inputs )
         self._assert_status_code_is( create_response, 200 )
         create = create_response.json()
         outputs = create[ 'outputs' ]
diff --git a/test/functional/tools/identifier_conditional.xml b/test/functional/tools/identifier_collection.xml
similarity index 75%
rename from test/functional/tools/identifier_conditional.xml
rename to test/functional/tools/identifier_collection.xml
index ff548d679f6..222302ebfce 100644
--- a/test/functional/tools/identifier_conditional.xml
+++ b/test/functional/tools/identifier_collection.xml
@@ -1,11 +1,11 @@
-<tool id="identifier_conditional" name="identifier_conditional">
+<tool id="identifier_collection" name="identifier_collection">
   <command>
     #for $input in $input1:
       echo '$input.element_identifier' >> 'output1';
     #end for
   </command>
   <inputs>
-    <param type="data_collection" collection_type="list" name="input1" label="Input 1" multiple="true" />
+    <param type="data_collection" collection_type="list" name="input1" label="Input 1" />
   </inputs>
   <outputs>
     <data name="output1" type="tabular" from_work_dir="output1" />
diff --git a/test/functional/tools/samples_tool_conf.xml b/test/functional/tools/samples_tool_conf.xml
index 112aa9da8c8..035abf68203 100644
--- a/test/functional/tools/samples_tool_conf.xml
+++ b/test/functional/tools/samples_tool_conf.xml
@@ -64,7 +64,7 @@
   <tool file="validation_empty_dataset.xml" />
   <tool file="identifier_single.xml" />
   <tool file="identifier_multiple.xml" />
-  <tool file="identifier_conditional.xml" />
+  <tool file="identifier_collection.xml" />
   <tool file="tool_directory.xml" />
   <tool file="output_action_change_format.xml" />
   <tool file="collection_paired_test.xml" />