diff --git a/MANIFEST b/MANIFEST
index 7f1da1af40f8..71bbb927b89c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -823,8 +823,8 @@ cpan/Encode/t/big5-eten.utf				test data
 cpan/Encode/t/big5-hkscs.enc				test data
 cpan/Encode/t/big5-hkscs.utf				test data
 cpan/Encode/t/CJKT.t					test script
-cpan/Encode/t/cow.t
-cpan/Encode/t/decode.t
+cpan/Encode/t/cow.t					Test file related to Encode
+cpan/Encode/t/decode.t					Test file related to Encode
 cpan/Encode/t/enc_data.t				test script for utf8 DATA
 cpan/Encode/t/enc_eucjp.t				test script
 cpan/Encode/t/enc_module.enc				test data for t/enc_module.t
@@ -841,7 +841,7 @@ cpan/Encode/t/gb2312.utf				test data
 cpan/Encode/t/grow.t					test script
 cpan/Encode/t/gsm0338.t					test script
 cpan/Encode/t/guess.t					test script
-cpan/Encode/t/isa.t
+cpan/Encode/t/isa.t					Test file related to Encode
 cpan/Encode/t/jis7-fallback.t				test script
 cpan/Encode/t/jisx0201.enc				test data
 cpan/Encode/t/jisx0201.utf				test data
@@ -865,18 +865,18 @@ cpan/Encode/t/rt65541.t					test script
 cpan/Encode/t/rt76824.t					test script
 cpan/Encode/t/rt85489.t					test script
 cpan/Encode/t/rt86327.t					test script
-cpan/Encode/t/taint.t
-cpan/Encode/t/truncated_utf8.t
-cpan/Encode/t/undef.t
+cpan/Encode/t/taint.t					Test file related to Encode
+cpan/Encode/t/truncated_utf8.t				Test file related to Encode
+cpan/Encode/t/undef.t					Test file related to Encode
 cpan/Encode/t/unibench.pl				benchmark script
 cpan/Encode/t/Unicode.t					test script
-cpan/Encode/t/Unicode_trailing_nul.t
-cpan/Encode/t/use-Encode-Alias.t
-cpan/Encode/t/utf32warnings.t
+cpan/Encode/t/Unicode_trailing_nul.t			Test file related to Encode
+cpan/Encode/t/use-Encode-Alias.t			Test file related to Encode
+cpan/Encode/t/utf32warnings.t				Test file related to Encode
 cpan/Encode/t/utf8ref.t					test script
 cpan/Encode/t/utf8strict.t				test script
-cpan/Encode/t/utf8warnings.t
-cpan/Encode/t/xml.t
+cpan/Encode/t/utf8warnings.t				Test file related to Encode
+cpan/Encode/t/xml.t					Test file related to Encode
 cpan/Encode/TW/Makefile.PL				Encode extension
 cpan/Encode/TW/TW.pm					Encode extension
 cpan/Encode/ucm/8859-1.ucm				Unicode Character Map
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index cc50e3490465..9fef54a7fbd1 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -403,7 +403,8 @@ package Maintainers;
     },
 
     'Encode' => {
-        'DISTRIBUTION' => 'DANKOGAI/Encode-3.19.tar.gz',
+        'DISTRIBUTION' => 'DANKOGAI/Encode-3.20.tar.gz',
+        'SYNCINFO'     => 'jkeenan on Fri Nov 10 15:12:07 2023',
         'FILES'        => q[cpan/Encode],
         'EXCLUDED'     => [
             qw( t/whatwg-aliases.json
diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index 8a2727fc4433..9d0e32d6bb8e 100644
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,5 +1,5 @@
 #
-# $Id: Encode.pm,v 3.19 2022/08/04 04:42:30 dankogai Exp $
+# $Id: Encode.pm,v 3.20 2023/11/10 01:09:56 dankogai Exp $
 #
 package Encode;
 use strict;
@@ -7,7 +7,7 @@ use warnings;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 our $VERSION;
 BEGIN {
-    $VERSION = sprintf "%d.%02d", q$Revision: 3.19 $ =~ /(\d+)/g;
+    $VERSION = sprintf "%d.%02d", q$Revision: 3.20 $ =~ /(\d+)/g;
     require XSLoader;
     XSLoader::load( __PACKAGE__, $VERSION );
 }
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index c1c9796002c8..502ae39d5a5e 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -3,7 +3,7 @@ BEGIN {
     # @INC poking  no longer needed w/ new MakeMaker and Makefile.PL's
     # with $ENV{PERL_CORE} set
     # In case we need it in future...
-    require Config; import Config;
+    require Config; Config->import();
     pop @INC if $INC[-1] eq '.';
 }
 use strict;
@@ -11,7 +11,7 @@ use warnings;
 use Getopt::Std;
 use Config;
 my @orig_ARGV = @ARGV;
-our $VERSION  = do { my @r = (q$Revision: 2.24 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION  = do { my @r = (q$Revision: 2.25 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
@@ -213,7 +213,7 @@ if (exists $opt{f}) {
 }
 
 my $cname = $opt{o} ? $opt{o} : shift(@ARGV);
-unless ($cname) { #debuging a win32 nmake error-only. works via cmdline
+unless ($cname) { # Debugging a Win32 nmake error-only; works via cmdline.
     print "\nARGV:";
     print "$_ " for @ARGV;
     print "\nopt:";
diff --git a/cpan/Encode/bin/encguess b/cpan/Encode/bin/encguess
index 440733eea0b9..d461a077e146 100644
--- a/cpan/Encode/bin/encguess
+++ b/cpan/Encode/bin/encguess
@@ -61,7 +61,7 @@ encguess - guess character encodings of files
 
 =head1 VERSION
 
-$Id: encguess,v 0.3 2020/12/02 01:28:17 dankogai Exp $
+$Id: encguess,v 0.4 2023/11/10 01:10:50 dankogai Exp dankogai $
 
 =head1 SYNOPSIS
 
@@ -138,7 +138,7 @@ L<Encode::Guess>, L<Encode::Detect>
 Copyright 2015 Michael LaGrasta and Dan Kogai.
 
 This program is free software; you can redistribute it and/or modify it
-under the terms of the the Artistic License (2.0). You may obtain a
+under the terms of the Artistic License (2.0). You may obtain a
 copy of the full license at:
 
 L<http://www.perlfoundation.org/artistic_license_2_0>
diff --git a/cpan/Encode/t/Aliases.t b/cpan/Encode/t/Aliases.t
index 23a1cd38e8d8..f7e353b3ded3 100644
--- a/cpan/Encode/t/Aliases.t
+++ b/cpan/Encode/t/Aliases.t
@@ -5,7 +5,7 @@ BEGIN {
     chdir 't';
     unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
     print "1..0 # Skip: Encode was not built\n";
         exit 0;
diff --git a/cpan/Encode/t/CJKT.t b/cpan/Encode/t/CJKT.t
index 264daf072f01..2fa4a0b4eb55 100644
--- a/cpan/Encode/t/CJKT.t
+++ b/cpan/Encode/t/CJKT.t
@@ -1,5 +1,5 @@
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/Encode.t b/cpan/Encode/t/Encode.t
index f60f37d59619..36decfaa1942 100644
--- a/cpan/Encode/t/Encode.t
+++ b/cpan/Encode/t/Encode.t
@@ -7,7 +7,7 @@ BEGIN {
         print "1..0 # Skip: EBCDIC\n";
         exit 0;
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/Encoder.t b/cpan/Encode/t/Encoder.t
index bfb4d8e0454b..216cb6d584ba 100644
--- a/cpan/Encode/t/Encoder.t
+++ b/cpan/Encode/t/Encoder.t
@@ -1,9 +1,9 @@
 #
-# $Id: Encoder.t,v 2.1 2013/09/14 07:51:59 dankogai Exp $
+# $Id: Encoder.t,v 2.2 2023/11/10 01:10:50 dankogai Exp dankogai $
 #
 
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/Unicode.t b/cpan/Encode/t/Unicode.t
index 61cef422fc86..13aa0d614303 100644
--- a/cpan/Encode/t/Unicode.t
+++ b/cpan/Encode/t/Unicode.t
@@ -1,12 +1,12 @@
 #
-# $Id: Unicode.t,v 2.4 2021/07/23 02:26:54 dankogai Exp $
+# $Id: Unicode.t,v 2.5 2023/11/10 01:10:50 dankogai Exp dankogai $
 #
 # This script is written entirely in ASCII, even though quoted literals
 # do include non-BMP unicode characters -- Are you happy, jhi?
 #
 
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/at-cn.t b/cpan/Encode/t/at-cn.t
index c82225ecae16..72529a5a4b30 100644
--- a/cpan/Encode/t/at-cn.t
+++ b/cpan/Encode/t/at-cn.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
     unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/at-tw.t b/cpan/Encode/t/at-tw.t
index 203fc34bc9bd..1e5385276463 100644
--- a/cpan/Encode/t/at-tw.t
+++ b/cpan/Encode/t/at-tw.t
@@ -1,7 +1,7 @@
 BEGIN {
     if (! -d 'blib' and -d 't'){ chdir 't' };
     unshift @INC,  '../lib';
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/enc_data.t b/cpan/Encode/t/enc_data.t
index 19619ae02ee3..131d779ad7a7 100644
--- a/cpan/Encode/t/enc_data.t
+++ b/cpan/Encode/t/enc_data.t
@@ -1,7 +1,7 @@
-# $Id: enc_data.t,v 2.6 2022/04/07 03:06:40 dankogai Exp $
+# $Id: enc_data.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
 
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/enc_eucjp.t b/cpan/Encode/t/enc_eucjp.t
index 84548af0d6de..e7217a995713 100644
--- a/cpan/Encode/t/enc_eucjp.t
+++ b/cpan/Encode/t/enc_eucjp.t
@@ -1,8 +1,8 @@
-# $Id: enc_eucjp.t,v 2.6 2019/01/31 04:26:40 dankogai Exp $
+# $Id: enc_eucjp.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
 # This is the twin of enc_utf8.t .
 
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/enc_module.t b/cpan/Encode/t/enc_module.t
index a96fc8dbcd59..c3ac81ed554c 100644
--- a/cpan/Encode/t/enc_module.t
+++ b/cpan/Encode/t/enc_module.t
@@ -1,7 +1,7 @@
-# $Id: enc_module.t,v 2.6 2022/04/07 03:06:40 dankogai Exp $
+# $Id: enc_module.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
 # This file is in euc-jp
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/enc_utf8.t b/cpan/Encode/t/enc_utf8.t
index ea8b80d2334d..102517697c4b 100644
--- a/cpan/Encode/t/enc_utf8.t
+++ b/cpan/Encode/t/enc_utf8.t
@@ -1,8 +1,8 @@
-# $Id: enc_utf8.t,v 2.6 2019/12/25 09:23:21 dankogai Exp $
+# $Id: enc_utf8.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
 # This is the twin of enc_eucjp.t .
 
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/encoding.t b/cpan/Encode/t/encoding.t
index d5009f510a5b..d087ce4029c3 100644
--- a/cpan/Encode/t/encoding.t
+++ b/cpan/Encode/t/encoding.t
@@ -1,5 +1,5 @@
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/fallback.t b/cpan/Encode/t/fallback.t
index 011c86dbfcfe..3064a751879d 100644
--- a/cpan/Encode/t/fallback.t
+++ b/cpan/Encode/t/fallback.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/grow.t b/cpan/Encode/t/grow.t
index e6b35fce0fb2..0c905484ca79 100644
--- a/cpan/Encode/t/grow.t
+++ b/cpan/Encode/t/grow.t
@@ -5,7 +5,7 @@ BEGIN {
          chdir 't';
          unshift @INC, '../lib';
      }
-     require Config; import Config;
+     require Config; Config->import();
      if ($Config{'extensions'} !~ /\bEncode\b/) {
          print "1..0 # Skip: Encode was not built\n";
              exit 0;
diff --git a/cpan/Encode/t/gsm0338.t b/cpan/Encode/t/gsm0338.t
index ab985838f3d0..a34b0fdcd7db 100644
--- a/cpan/Encode/t/gsm0338.t
+++ b/cpan/Encode/t/gsm0338.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
@@ -16,6 +16,10 @@ use utf8;
 use Test::More tests => 777;
 use Encode;
 use Encode::GSM0338;
+use PerlIO::encoding;
+
+# perl < 5.8.8 didn't enable STOP_AT_PARTIAL by default
+$PerlIO::encoding::fallback |= Encode::STOP_AT_PARTIAL;
 
 my $chk = Encode::LEAVE_SRC();
 
diff --git a/cpan/Encode/t/guess.t b/cpan/Encode/t/guess.t
index 896028ba8ddd..c927efd8d962 100644
--- a/cpan/Encode/t/guess.t
+++ b/cpan/Encode/t/guess.t
@@ -1,5 +1,5 @@
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/jperl.t b/cpan/Encode/t/jperl.t
index c49c6b86c098..38fab02a9dd7 100644
--- a/cpan/Encode/t/jperl.t
+++ b/cpan/Encode/t/jperl.t
@@ -1,10 +1,10 @@
 #
-# $Id: jperl.t,v 2.6 2022/04/07 03:06:40 dankogai Exp $
+# $Id: jperl.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
 #
 # This script is written in euc-jp
 
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/magic.t b/cpan/Encode/t/magic.t
index 8295152247ef..d450208596df 100644
--- a/cpan/Encode/t/magic.t
+++ b/cpan/Encode/t/magic.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/mime-header.t b/cpan/Encode/t/mime-header.t
index de74241a15a1..ebd5153a0a7c 100644
--- a/cpan/Encode/t/mime-header.t
+++ b/cpan/Encode/t/mime-header.t
@@ -1,5 +1,5 @@
 #
-# $Id: mime-header.t,v 2.16 2022/06/25 01:58:57 dankogai Exp $
+# $Id: mime-header.t,v 2.17 2023/11/10 01:10:50 dankogai Exp dankogai $
 # This script is written in utf8
 #
 BEGIN {
@@ -7,7 +7,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/mime-name.t b/cpan/Encode/t/mime-name.t
index cec86c0362a1..3275f11f27d2 100644
--- a/cpan/Encode/t/mime-name.t
+++ b/cpan/Encode/t/mime-name.t
@@ -1,5 +1,5 @@
 #
-# $Id: mime-name.t,v 1.3 2017/10/06 22:21:53 dankogai Exp $
+# $Id: mime-name.t,v 1.4 2023/11/10 01:10:50 dankogai Exp dankogai $
 # This script is written in utf8
 #
 BEGIN {
@@ -7,7 +7,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/perlio.t b/cpan/Encode/t/perlio.t
index e50dfa4d7302..36f4883a51ac 100644
--- a/cpan/Encode/t/perlio.t
+++ b/cpan/Encode/t/perlio.t
@@ -1,5 +1,5 @@
 BEGIN {
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/rt.pl b/cpan/Encode/t/rt.pl
index 5959d56e9981..a512ac72297b 100644
--- a/cpan/Encode/t/rt.pl
+++ b/cpan/Encode/t/rt.pl
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-# $Id: rt.pl,v 2.1 2006/05/03 18:24:10 dankogai Exp $
+# $Id: rt.pl,v 2.2 2023/11/10 01:10:50 dankogai Exp dankogai $
 #
 
 BEGIN {
@@ -10,7 +10,7 @@ BEGIN
         unshift @INC, '../lib';
         $ucmdir = "../ext/Encode/ucm";
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/rt113164.t b/cpan/Encode/t/rt113164.t
index f0a94ea066ca..20bd87ff84e9 100644
--- a/cpan/Encode/t/rt113164.t
+++ b/cpan/Encode/t/rt113164.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/rt65541.t b/cpan/Encode/t/rt65541.t
index 4a75ce3c7b93..813c630358ce 100644
--- a/cpan/Encode/t/rt65541.t
+++ b/cpan/Encode/t/rt65541.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/rt76824.t b/cpan/Encode/t/rt76824.t
index 5d057f607e9d..db49735e19d3 100644
--- a/cpan/Encode/t/rt76824.t
+++ b/cpan/Encode/t/rt76824.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/rt85489.t b/cpan/Encode/t/rt85489.t
index 3b28e35af6a5..017e063c302e 100644
--- a/cpan/Encode/t/rt85489.t
+++ b/cpan/Encode/t/rt85489.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/rt86327.t b/cpan/Encode/t/rt86327.t
index 91527f849c65..1f4e990a2a42 100644
--- a/cpan/Encode/t/rt86327.t
+++ b/cpan/Encode/t/rt86327.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/truncated_utf8.t b/cpan/Encode/t/truncated_utf8.t
index d6c3363eb62a..8dfa49c8e8d7 100644
--- a/cpan/Encode/t/truncated_utf8.t
+++ b/cpan/Encode/t/truncated_utf8.t
@@ -3,7 +3,7 @@ BEGIN {
         chdir 't';
         unshift @INC, '../lib';
     }
-    require Config; import Config;
+    require Config; Config->import();
     if ($Config{'extensions'} !~ /\bEncode\b/) {
       print "1..0 # Skip: Encode was not built\n";
       exit 0;
diff --git a/cpan/Encode/t/utf8strict.t b/cpan/Encode/t/utf8strict.t
index 39293d3067af..ee943cfd5669 100644
--- a/cpan/Encode/t/utf8strict.t
+++ b/cpan/Encode/t/utf8strict.t
@@ -6,7 +6,7 @@ BEGIN {
          chdir 't';
          unshift @INC, '../lib';
      }
-     require Config; import Config;
+     require Config; Config->import();
      if ($Config{'extensions'} !~ /\bEncode\b/) {
          print "1..0 # Skip: Encode was not built\n";
      exit 0;