diff --git a/suites/hg/benchmarks/cat.pbd b/suites/hg/benchmarks/cat.pbd
index 796b52394d7889269003017bebda2a65d9fb3e39_c3VpdGVzL2hnL2JlbmNobWFya3MvY2F0LnBiZA==..a999904b491010e96118c352494eb34bb4eec261_c3VpdGVzL2hnL2JlbmNobWFya3MvY2F0LnBiZA== 100644
--- a/suites/hg/benchmarks/cat.pbd
+++ b/suites/hg/benchmarks/cat.pbd
@@ -14,6 +14,5 @@
 # each run, especially the one who do not need them.
 
 hg files $REV --template 'path:{path}\n' | sort > ../all_sorted.path;
-
 shuf ../all_sorted.path --random-source=../all_sorted.path > ../all_suffled.path;
 
@@ -18,3 +17,6 @@
 shuf ../all_sorted.path --random-source=../all_sorted.path > ../all_suffled.path;
 
+hg files $REV --template 'filepath:{path}\n' | sort > ../all_sorted.filepath;
+shuf ../all_sorted.filepath --random-source=../all_sorted.filepath > ../all_suffled.filepath;
+
 hg files $REV | sed 's/\\({\\|}\\|\\[\\|\\]\\|*\\|?\\)/\\\\\\1/g' | sort > ../all_sorted.pattern;
@@ -20,5 +22,4 @@
 hg files $REV | sed 's/\\({\\|}\\|\\[\\|\\]\\|*\\|?\\)/\\\\\\1/g' | sort > ../all_sorted.pattern;
-
 shuf ../all_sorted.pattern --random-source=../all_sorted.pattern > ../all_suffled.pattern;
 """
 
@@ -47,6 +48,12 @@
 [simple-command.variants.dimensions.files.all-list-path-shuffled]
 environment.FILES='set:listfile:../all_suffled.path'
 
+[simple-command.variants.dimensions.files.all-list-filepath-sorted]
+environment.FILES='set:listfile:../all_sorted.filepath'
+
+[simple-command.variants.dimensions.files.all-list-filepath-shuffled]
+environment.FILES='set:listfile:../all_suffled.filepath'
+
 [simple-command.variants.dimensions.files.all-list-pattern-sorted]
 environment.FILES='set:listfile:../all_sorted.pattern'
 
diff --git a/suites/hg/benchmarks/files.pbd b/suites/hg/benchmarks/files.pbd
index 796b52394d7889269003017bebda2a65d9fb3e39_c3VpdGVzL2hnL2JlbmNobWFya3MvZmlsZXMucGJk..a999904b491010e96118c352494eb34bb4eec261_c3VpdGVzL2hnL2JlbmNobWFya3MvZmlsZXMucGJk 100644
--- a/suites/hg/benchmarks/files.pbd
+++ b/suites/hg/benchmarks/files.pbd
@@ -16,6 +16,5 @@
 # each run, especially the one who do not need them.
 
 hg files $REV --template 'path:{path}\n' | sort > ../all_sorted.path;
-
 shuf ../all_sorted.path --random-source=../all_sorted.path > ../all_suffled.path;
 
@@ -20,3 +19,6 @@
 shuf ../all_sorted.path --random-source=../all_sorted.path > ../all_suffled.path;
 
+hg files $REV --template 'filepath:{path}\n' | sort > ../all_sorted.filepath;
+shuf ../all_sorted.filepath --random-source=../all_sorted.filepath > ../all_suffled.filepath;
+
 hg files $REV | sed 's/\\({\\|}\\|\\[\\|\\]\\|*\\|?\\)/\\\\\\1/g' | sort > ../all_sorted.pattern;
@@ -22,5 +24,4 @@
 hg files $REV | sed 's/\\({\\|}\\|\\[\\|\\]\\|*\\|?\\)/\\\\\\1/g' | sort > ../all_sorted.pattern;
-
 shuf ../all_sorted.pattern --random-source=../all_sorted.pattern > ../all_suffled.pattern;
 """
 
@@ -53,6 +54,12 @@
 [simple-command.variants.dimensions.files.all-list-path-shuffled]
 environment.FILES='set:listfile:../all_suffled.path'
 
+[simple-command.variants.dimensions.files.all-list-filepath-sorted]
+environment.FILES='set:listfile:../all_sorted.filepath'
+
+[simple-command.variants.dimensions.files.all-list-filepath-shuffled]
+environment.FILES='set:listfile:../all_suffled.filepath'
+
 [simple-command.variants.dimensions.files.all-list-pattern-sorted]
 environment.FILES='set:listfile:../all_sorted.pattern'