diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php
index 216ebe7d5c..2701254f7a 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php
@@ -59,7 +59,7 @@ public static function cases(ContainerInterface $container = NULL, AccountInterf
       ]
     );
 
-    $placeholder_id = UrlHelper::buildQuery(['callback' => 'Drupal\Core\Render\Element\StatusMessages::renderMessages', 'args' => [NULL], 'token' => 'a8c34b5e']);
+    $placeholder_id = UrlHelper::buildQuery(['callback' => 'Drupal\Core\Render\Element\StatusMessages::renderMessages', 'args' => [NULL], 'token' => '_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA']);
     $encoded_placeholder_id = Html::escape($placeholder_id);
     $status_messages->bigPipePlaceholderId = $encoded_placeholder_id;
     $status_messages->bigPipePlaceholderRenderArray = [
@@ -251,7 +251,7 @@ public static function cases(ContainerInterface $container = NULL, AccountInterf
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::exception', ['llamas', 'suck']],
       ]
     );
-    $placeholder_id = UrlHelper::buildQuery(['callback' => '\Drupal\big_pipe_test\BigPipeTestController::exception', 'args' => ['llamas', 'suck'], 'token' => '68a75f1a']);
+    $placeholder_id = UrlHelper::buildQuery(['callback' => '\Drupal\big_pipe_test\BigPipeTestController::exception', 'args' => ['llamas', 'suck'], 'token' => 'uhKFNfT4eF449_W-kDQX8E5z4yHyt0-nSHUlwaGAQeU']);
     $encoded_placeholder_id = Html::escape($placeholder_id);
     $exception->bigPipePlaceholderId = $encoded_placeholder_id;
     $exception->bigPipePlaceholderRenderArray = [
@@ -293,7 +293,7 @@ public static function cases(ContainerInterface $container = NULL, AccountInterf
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::responseException', []],
       ]
     );
-    $placeholder_id = UrlHelper::buildQuery(['callback' => '\Drupal\big_pipe_test\BigPipeTestController::responseException', 'args' => [], 'token' => '2a9bd022']);
+    $placeholder_id = UrlHelper::buildQuery(['callback' => '\Drupal\big_pipe_test\BigPipeTestController::responseException', 'args' => [], 'token' => 'PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU']);
     $encoded_placeholder_id = Html::escape($placeholder_id);
     $embedded_response_exception->bigPipePlaceholderId = $encoded_placeholder_id;
     $embedded_response_exception->bigPipePlaceholderRenderArray = [
diff --git a/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php b/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
index b4e5767614..32e1f595ab 100644
--- a/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
+++ b/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
@@ -62,7 +62,7 @@ public function providerRender() {
         [],
         [
           'iframe' => [
-            'src' => '/media/oembed?url=https%3A//vimeo.com/7073899',
+            'src' => '/media/oembed?url=https%3A%2F%2Fvimeo.com%2F7073899',
             'width' => '480',
             'height' => '360',
             'title' => 'Drupal Rap Video - Schipulcon09',
@@ -75,7 +75,7 @@ public function providerRender() {
         ['max_width' => '100', 'max_height' => '100'],
         [
           'iframe' => [
-            'src' => '/media/oembed?url=https%3A//vimeo.com/7073899',
+            'src' => '/media/oembed?url=https%3A%2F%2Fvimeo.com%2F7073899',
             'width' => '100',
             'height' => '100',
             'title' => 'Drupal Rap Video - Schipulcon09',
@@ -88,7 +88,7 @@ public function providerRender() {
         [],
         [
           'iframe' => [
-            'src' => '/media/oembed?url=https%3A//vimeo.com/7073899',
+            'src' => '/media/oembed?url=https%3A%2F%2Fvimeo.com%2F7073899',
             'width' => '480',
             'height' => '360',
             'title' => NULL,
@@ -101,7 +101,7 @@ public function providerRender() {
         [],
         [
           'iframe' => [
-            'src' => '/media/oembed?url=https%3A//twitter.com/drupaldevdays/status/935643039741202432',
+            'src' => '/media/oembed?url=https%3A%2F%2Ftwitter.com%2Fdrupaldevdays%2Fstatus%2F935643039741202432',
             'width' => '550',
             'height' => '360',
           ],
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index 35ebc81c81..7c6f2d7dca 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -325,7 +325,7 @@ public function testAliasGenerationWithParameters() {
 
     // Specify a query parameter with NULL.
     $options = ['query' => ['page' => NULL], 'fragment' => 'bottom'];
-    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?page#bottom', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?page=#bottom', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
   }
 
   /**
@@ -367,7 +367,7 @@ public function providerTestAliasGenerationWithOptions() {
       'test_2',
       ['narf' => '7'],
       ['query' => ['page' => '1/2'], 'fragment' => 'bottom'],
-      '/test/two/7?page=1/2#bottom',
+      '/test/two/7?page=1%2F2#bottom',
     ];
     // A NULL query string.
     $data['query-with-NULL'] = [