diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php
index cbac1f6a0..82cab2841 100644
--- a/src/Extension/EscaperExtension.php
+++ b/src/Extension/EscaperExtension.php
@@ -110,7 +110,7 @@ final class EscaperExtension extends AbstractExtension
 
         $this->escapers[$strategy] = $callable;
         $callable = function ($string, $charset) use ($callable) {
-            return $callable($this->environment, $string, $charset);
+            return $callable($this->environment, $string);
         };
 
         $this->escaper->setEscaper($strategy, $callable);
diff --git a/tests/Extension/EscaperTest.php b/tests/Extension/EscaperTest.php
index d53f3b529..e51f25e1e 100644
--- a/tests/Extension/EscaperTest.php
+++ b/tests/Extension/EscaperTest.php
@@ -29,7 +29,7 @@ class EscaperTest extends TestCase
         $twig = new Environment($this->createMock(LoaderInterface::class));
         $escaperExt = $twig->getExtension(EscaperExtension::class);
         $escaperExt->setEnvironment($twig);
-        $escaperExt->setEscaper('foo', 'Twig\Tests\foo_escaper_for_test');
+        $escaperExt->setEscaper('foo', 'Twig\Tests\legacy_escaper');
         $this->assertSame($expected, $twig->getRuntime(EscaperRuntime::class)->escape($string, $strategy));
     }
 
@@ -50,24 +50,24 @@ class EscaperTest extends TestCase
         $env1 = new Environment($this->createMock(LoaderInterface::class));
         $escaperExt1 = $env1->getExtension(EscaperExtension::class);
         $escaperExt1->setEnvironment($env1);
-        $escaperExt1->setEscaper('foo', 'Twig\Tests\foo_escaper_for_test');
+        $escaperExt1->setEscaper('foo', 'Twig\Tests\legacy_escaper');
 
         $env2 = new Environment($this->createMock(LoaderInterface::class));
         $escaperExt2 = $env2->getExtension(EscaperExtension::class);
         $escaperExt2->setEnvironment($env2);
-        $escaperExt2->setEscaper('foo', 'Twig\Tests\foo_escaper_for_test1');
+        $escaperExt2->setEscaper('foo', 'Twig\Tests\legacy_escaper_again');
 
         $this->assertSame('fooUTF-8', $env1->getRuntime(EscaperRuntime::class)->escape('foo', 'foo'));
         $this->assertSame('fooUTF-81', $env2->getRuntime(EscaperRuntime::class)->escape('foo', 'foo'));
     }
 }
 
-function foo_escaper_for_test(Environment $twig, $string, $charset)
+function legacy_escaper(Environment $twig, $string)
 {
-    return $string.$charset;
+    return $string.$twig->getCharset();
 }
 
-function foo_escaper_for_test1(Environment $twig, $string, $charset)
+function legacy_escaper_again(Environment $twig, $string)
 {
-    return $string.$charset.'1';
+    return $string.$twig->getCharset().'1';
 }
diff --git a/tests/Runtime/EscaperRuntimeTest.php b/tests/Runtime/EscaperRuntimeTest.php
index 2dc4bb95e..042473408 100644
--- a/tests/Runtime/EscaperRuntimeTest.php
+++ b/tests/Runtime/EscaperRuntimeTest.php
@@ -353,7 +353,7 @@ class EscaperRuntimeTest extends TestCase
     public function testCustomEscaper($expected, $string, $strategy)
     {
         $escaper = new EscaperRuntime();
-        $escaper->setEscaper('foo', 'Twig\Tests\foo_escaper_for_test_runtime');
+        $escaper->setEscaper('foo', 'Twig\Tests\escaper');
         $this->assertSame($expected, $escaper->escape($string, $strategy));
     }
 
@@ -389,16 +389,11 @@ class EscaperRuntimeTest extends TestCase
     }
 }
 
-function foo_escaper_for_test_runtime($string, $charset)
+function escaper($string, $charset)
 {
     return $string.$charset;
 }
 
-function foo_escaper_for_test1_runtime($string, $charset)
-{
-    return $string.$charset.'1';
-}
-
 interface Extension_SafeHtmlInterface
 {
 }