diff --git a/test/functional/tools/composite_shapefile.xml b/test/functional/tools/composite_shapefile.xml
index ded8fcde7b1..1e2c41b5e46 100644
--- a/test/functional/tools/composite_shapefile.xml
+++ b/test/functional/tools/composite_shapefile.xml
@@ -4,7 +4,7 @@
     </requirements>
     <command><![CDATA[
         mkdir '$output_shapefile.extra_files_path' &&
-        python -c "import fiona; shape = fiona.open("$input.extra_files_path/shapefile.shp"); print(shape.schema)" > '$output' &&
+        python -c "import fiona; shape = fiona.open('$input.extra_files_path/shapefile.shp'); print(shape.schema)" > '$output' &&
         cp '$input.extra_files_path'/* '$output_shapefile.extra_files_path'
     ]]>
     </command>
@@ -18,21 +18,21 @@
     <tests>
         <test>
             <param name="input" value="" ftype="shp" >
-                <composite_data value="shapefile/shapefile.dbf"/>
-                <composite_data value="shapefile/shapefile.prj"/>
                 <composite_data value="shapefile/shapefile.shp"/>
                 <composite_data value="shapefile/shapefile.shx"/>
+                <composite_data value="shapefile/shapefile.dbf"/>
+                <composite_data value="shapefile/shapefile.prj"/>
             </param>
             <output name="output">
                 <assert_contents>
                     <has_text text="{'properties': OrderedDict([('FIPS', 'str:2'), ('ISO2', 'str:2'), ('ISO3', 'str:3'), ('UN', 'int:3')," />
                 </assert_contents>
             </output>
-            <output name="output" file="shapefile/output.html">
-                <extra_files type="file" name="shapefile.dbf" value="shapefile/shapefile.dbf" compare="sim_size" />
-                <extra_files type="file" name="shapefile.prj" value="shapefile/shapefile.prj" compare="sim_size" />
+            <output name="output_shapefile" file="shapefile/output.html">
                 <extra_files type="file" name="shapefile.shp" value="shapefile/shapefile.shp" compare="sim_size" />
                 <extra_files type="file" name="shapefile.shx" value="shapefile/shapefile.shx" compare="sim_size" />
+                <extra_files type="file" name="shapefile.dbf" value="shapefile/shapefile.dbf" compare="sim_size" />
+                <extra_files type="file" name="shapefile.prj" value="shapefile/shapefile.prj" compare="sim_size" />
             </output>
         </test>
     </tests>