texlive/biber-perl-5.22.dif

---
 lib/Biber/Input/file/bibtex.pm |    6 +++---
 lib/Biber/LaTeX/Recode.pm      |    6 +++---
 lib/Biber/Utils.pm             |    2 +-
 t/basic-misc.t                 |    2 +-
 t/biblatexml.t                 |    2 +-
 t/bibtex-aliases.t             |    2 +-
 t/bibtex-output.t              |    2 +-
 t/crossrefs.t                  |    2 +-
 t/dm-constraints.t             |    2 +-
 t/dm-dateformats.t             |    2 +-
 t/encoding.t                   |    2 +-
 t/endnotexml.t                 |    2 +-
 t/extratitle.t                 |    2 +-
 t/extratitleyear.t             |    2 +-
 t/extrayear.t                  |    2 +-
 t/labelalpha.t                 |    2 +-
 t/labelname.t                  |    2 +-
 t/names.t                      |    2 +-
 t/options.t                    |    3 ++-
 t/related-entries.t            |    2 +-
 t/remote-files.t               |    2 +-
 t/ris.t                        |    2 +-
 t/sections-complex.t           |    2 +-
 t/sections.t                   |    2 +-
 t/set-dynamic.t                |    2 +-
 t/set-legacy.t                 |    2 +-
 t/set-static.t                 |    2 +-
 t/skips.t                      |    2 +-
 t/sort-case.t                  |    2 +-
 t/sort-complex.t               |    2 +-
 t/sort-order.t                 |    4 ++--
 t/sort-uc.t                    |    2 +-
 t/sorting.t                    |    2 +-
 t/tool-bltxml.t                |    2 +-
 t/tool.t                       |    2 +-
 t/uniqueness.t                 |   32 ++++++++++++++++----------------
 t/xdata.t                      |    2 +-
 t/zoterordfxml.t               |    2 +-
 38 files changed, 59 insertions(+), 58 deletions(-)

--- lib/Biber/Input/file/bibtex.pm
+++ lib/Biber/Input/file/bibtex.pm
@@ -759,7 +757,7 @@ sub _name {
     # Check for malformed names in names which aren't completely escaped
 
     # Too many commas
-    unless ($name =~ m/\A{\X+}\z/xms) { # Ignore these tests for escaped names
+    unless ($name =~ m/\A\{\X+\}\z/xms) { # Ignore these tests for escaped names
       my @commas = $name =~ m/,/g;
       if ($#commas > 1) {
         biber_warn("Name \"$name\" has too many commas: skipping name", $bibentry);
@@ -1262,8 +1260,8 @@ my %months = (
 
 sub _hack_month {
   my $in_month = shift;
-  if ($in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
-    return $months{lc(Unicode::GCString->new($1)->substr(0,3)->as_string)};
+  if (my ($m) = $in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
+    return $months{lc(Unicode::GCString->new($m)->substr(0,3)->as_string)};
   }
   else {
     return $in_month;
--- lib/Biber/LaTeX/Recode.pm
+++ lib/Biber/LaTeX/Recode.pm
@@ -230,13 +230,13 @@ sub latex_decode {
         $text =~ s/\\not\\($re)/$map->{$1}/ge;
       }
       elsif ($type eq 'superscripts') {
-        $text =~ s/\\textsuperscript{($re)}/$map->{$1}/ge;
+        $text =~ s/\\textsuperscript\{($re)\}/$map->{$1}/ge;
       }
       elsif ($type eq 'cmdsuperscripts') {
-        $text =~ s/\\textsuperscript{\\($re)}/$map->{$1}/ge;
+        $text =~ s/\\textsuperscript\{\\($re)\}/$map->{$1}/ge;
       }
       elsif ($type eq 'dings') {
-        $text =~ s/\\ding{([2-9AF][0-9A-F])}/$map->{$1}/ge;
+        $text =~ s/\\ding\{([2-9AF][0-9A-F])\}/$map->{$1}/ge;
       }
       elsif ($type eq 'letters') {
         $text =~ s/\\($re)(?:\{\}|\s+|\b)/$map->{$1}/ge;
--- lib/Biber/Utils.pm
+++ lib/Biber/Utils.pm
@@ -436,7 +436,7 @@ sub reduce_array {
 
 sub remove_outer {
   my $str = shift;
-  $str =~ s/^{(\X+)}$/$1/;
+  $str =~ s/^\{(\X+)\}$/$1/;
   return $str;
 }
 
--- t/basic-misc.t
+++ t/basic-misc.t
@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 Biber::Config->setblxoption('uniquelist', 1);
 Biber::Config->setblxoption('maxcitenames', 3);
--- t/biblatexml.t
+++ t/biblatexml.t
@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Now generate the information
 $biber->prepare;
--- t/bibtex-aliases.t
+++ t/bibtex-aliases.t
@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('validate_datamodel', 1);
 
 # THERE IS A MAPPING SECTION IN THE .bcf BEING USED TO TEST USER MAPS TOO!
--- t/bibtex-output.t
+++ t/bibtex-output.t
@@ -36,7 +36,7 @@ Log::Log4perl->init(\$l4pconf);
 # Biber options
 Biber::Config->setoption('output_resolve', 1);
 Biber::Config->setoption('output_format', 'bibtex');
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 $biber->parse_ctrlfile('bibtex-output.bcf');
 $biber->set_output_obj(Biber::Output::bibtex->new());
 
--- t/crossrefs.t
+++ t/crossrefs.t
@@ -40,8 +40,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('nodieonerror', 1); # because there is a failing cyclic crossref check
 
 # Now generate the information
--- t/dm-constraints.t
+++ t/dm-constraints.t
@@ -50,9 +50,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 Biber::Config->setoption('validate_datamodel', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Now generate the information
 $biber->prepare;
--- t/dm-dateformats.t
+++ t/dm-dateformats.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('validate_datamodel', 1);
 
 # Biblatex options
--- t/encoding.t
+++ t/encoding.t
@@ -30,8 +30,8 @@ my $l4pconf = qq|
 |;
 Log::Log4perl->init(\$l4pconf);
 
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 my $encode1 = q|    \entry{testŠ}{book}{}
       \name{author}{1}{}{%
--- t/endnotexml.t
+++ t/endnotexml.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
 
--- t/extratitle.t
+++ t/extratitle.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
--- t/extratitleyear.t
+++ t/extratitleyear.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Now generate the information
 $biber->prepare;
--- t/extrayear.t
+++ t/extrayear.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
--- t/labelalpha.t
+++ t/labelalpha.t
@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Biblatex options
 Biber::Config->setblxoption('maxalphanames', 1);
--- t/labelname.t
+++ t/labelname.t
@@ -27,8 +27,8 @@ my $l4pconf = qq|
 |;
 Log::Log4perl->init(\$l4pconf);
 
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 $biber->parse_ctrlfile("general1.bcf");
 $biber->set_output_obj(Biber::Output::bbl->new());
 
--- t/names.t
+++ t/names.t
@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('namesep', 'und'); # Testing custom name splitting string
 Biber::Config->setoption('others_string', 'andere'); # Testing custom implied "et al"
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setblxoption('mincitenames', 3);
 
 # Now generate the information
--- t/options.t
+++ t/options.t
@@ -34,8 +34,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+
 # Testing customg xsv format sep
 Biber::Config->setoption('xsvsep', '\s*\|\s*');
 
--- t/related-entries.t
+++ t/related-entries.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Now generate the information
 $biber->prepare;
--- t/remote-files.t
+++ t/remote-files.t
@@ -41,8 +41,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('quiet', 1);
 Biber::Config->setoption('nodieonerror', 1); # because the remote bibs might be messy
 
--- t/ris.t
+++ t/ris.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
 
--- t/sections-complex.t
+++ t/sections-complex.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
--- t/sections.t
+++ t/sections.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 Biber::Config->setoption('output_safechars', 1);
 
--- t/set-dynamic.t
+++ t/set-dynamic.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 
 # Now generate the information
 $biber->prepare;
--- t/set-legacy.t
+++ t/set-legacy.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 
 # Now generate the information
--- t/set-static.t
+++ t/set-static.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 
 # Now generate the information
--- t/skips.t
+++ t/skips.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('fastsort', 1);
 
 # Now generate the information
--- t/sort-case.t
+++ t/sort-case.t
@@ -33,7 +33,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 Biber::Config->setoption('sortcase', 1);
 Biber::Config->setoption('sortupper', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 $S =  [
                                                 [
--- t/sort-complex.t
+++ t/sort-complex.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 # relying on here for tests
 
 # Biber options
+Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 # Want to ignore SHORTHAND* fields for the first few tests
 Biber::Config->setoption('sourcemap', [
   {
--- t/sort-order.t
+++ t/sort-order.t
@@ -31,8 +31,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 
 # Options - we could set these in the control file but it's nice to see what we're
 # relying on here for tests
+Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
 Biber::Config->setblxoption('labelyear', undef);
 Biber::Config->setblxoption('labelalpha', 0);
 
--- t/sort-uc.t
+++ t/sort-uc.t
@@ -31,7 +31,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 
 # Options - we could set these in the control file but it's nice to see what we're
 # relying on here for tests
-Biber::Config->setoption('sortlocale', 'sv_SE');
+Biber::Config->setoption('sortlocale', 'sv_SE.UTF-8');
 
 # U::C Swedish tailoring
 $biber->prepare;
--- t/sorting.t
+++ t/sorting.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 my $yearoff1    = 'mm,,Knuth!Donald E,Computers Typesetting,1984,0000';
 my $yearoff2    = 'mm,,Knuth!Donald E,Computers Typesetting,198,0000';
--- t/tool-bltxml.t
+++ t/tool-bltxml.t
@@ -44,7 +44,7 @@ $out->set_output_target_file(\$outvar);
 Biber::Config->setoption('tool', 1);
 Biber::Config->setoption('output_resolve', 1);
 Biber::Config->setoption('output_format', 'biblatexml');
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 # THERE IS A CONFIG FILE BEING READ!
 
--- t/tool.t
+++ t/tool.t
@@ -38,7 +38,7 @@ $biber->set_output_obj(Biber::Output::bibtex->new());
 Biber::Config->setoption('tool', 1);
 Biber::Config->setoption('output_resolve', 1);
 Biber::Config->setoption('output_format', 'bibtex');
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 # THERE IS A CONFIG FILE BEING READ!
 
--- t/uniqueness.t
+++ t/uniqueness.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
@@ -84,7 +84,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
@@ -111,7 +111,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 5);
@@ -138,7 +138,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 2);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -157,7 +157,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 1);
 Biber::Config->setblxoption('uniquelist', 1);
@@ -218,7 +218,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -247,7 +247,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 3);
 Biber::Config->setblxoption('mincitenames', 3);
@@ -317,7 +317,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 3);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -357,7 +357,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 2);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -393,7 +393,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 1);
 Biber::Config->setblxoption('mincitenames', 1);
@@ -422,7 +422,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('maxcitenames', 3);
 Biber::Config->setblxoption('mincitenames', 2);
@@ -451,7 +451,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 1);
 Biber::Config->setblxoption('uniquelist', 0);
@@ -480,7 +480,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 2);
 Biber::Config->setblxoption('uniquelist', 1);
@@ -509,7 +509,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 0);
 Biber::Config->setblxoption('uniquelist', 0);
@@ -538,7 +538,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 3);
 Biber::Config->setblxoption('uniquelist', 1);
@@ -565,7 +565,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
 $biber->set_output_obj(Biber::Output::bbl->new());
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 # Biblatex options
 Biber::Config->setblxoption('uniquename', 4);
 Biber::Config->setblxoption('uniquelist', 1);
--- t/xdata.t
+++ t/xdata.t
@@ -44,7 +44,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 Biber::Config->setoption('nodieonerror', 1); # because there is a cyclic xdata check
 
 # Now generate the information
--- t/zoterordfxml.t
+++ t/zoterordfxml.t
@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
 
 # Biber options
 Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
 
 # Now generate the information
 $biber->prepare;