From 131b822f3f5b84fbc5a40faa95d8e949e8a5cdc7 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 15 Jan 2025 16:20:14 +0100
Subject: [PATCH] Bug 37918: Remove the new dependency

---
 cpanfile                       | 1 -
 t/Koha_Template_Email_Header.t | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpanfile b/cpanfile
index 61e2ee4d6e1..ce62d7b0637 100644
--- a/cpanfile
+++ b/cpanfile
@@ -114,7 +114,6 @@ requires 'Test', '1.25';
 requires 'Test::Harness', '2.56';
 requires 'Test::MockModule', '0.05';
 requires 'Test::More', '1.302073';
-requires 'Test::More::UTF8', '0.05';
 requires 'Text::Bidi', '0.03';
 requires 'Text::CSV', '0.01';
 requires 'Text::CSV::Encoded', '0.09';
diff --git a/t/Koha_Template_Email_Header.t b/t/Koha_Template_Email_Header.t
index 3f6e21a9558..da9834c33f9 100644
--- a/t/Koha_Template_Email_Header.t
+++ b/t/Koha_Template_Email_Header.t
@@ -19,9 +19,8 @@ use utf8;
 use Modern::Perl;
 
 use Test::More tests => 4;
-use Test::More::UTF8;
 
-use Encode qw(encode);
+use Encode qw(encode encode_utf8);
 use Encode::MIME::Header;
 
 use open qw( :std :encoding(UTF-8) );
@@ -48,7 +47,7 @@ my @tests = (
 
 # Test each case
 for my $test (@tests) {
-     is($filter->filter($test->{input}), $test->{expected}, "Correctly encoded: '$test->{input} -> $test->{expected}'");
+     is($filter->filter($test->{input}), $test->{expected}, encode_utf8("Correctly encoded: '$test->{input} -> $test->{expected}'"));
 }
 
 done_testing();
-- 
2.34.1