diff --git a/core/modules/system/src/Tests/Element/PathElementFormTest.php b/core/modules/system/src/Tests/Element/PathElementFormTest.php
index 8bf5622..758fcb6 100644
--- a/core/modules/system/src/Tests/Element/PathElementFormTest.php
+++ b/core/modules/system/src/Tests/Element/PathElementFormTest.php
@@ -159,7 +159,7 @@ public function testPathElement() {
         'required_validate_url' => 'user/' . $this->testUser->id(),
       ]);
     $form_builder = $this->container->get('form_builder');
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, $form_state) {
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, &$form_state) {
       $form_builder->submitForm($this, $form_state);
     });
 
@@ -186,7 +186,7 @@ public function testPathElement() {
         'required_validate_route' => 'user/' . $this->testUser->id(),
         'required_validate_url' => 'user/' . $this->testUser->id(),
       ]);
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, $form_state) {
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, &$form_state) {
       $form_builder->submitForm($this, $form_state);
     });
     $errors = $form_state->getErrors();
@@ -203,7 +203,7 @@ public function testPathElement() {
         'required_validate_url' => 'user/74',
       ]);
     $form_builder = $this->container->get('form_builder');
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, $form_state) {
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, &$form_state) {
       $form_builder->submitForm($this, $form_state);
     });
 
diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index e94f0e3..befcefd 100644
--- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -230,7 +230,7 @@ private function formSubmitHelper($form, $edit) {
 
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_id, $form, $form_state) {
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_id, &$form, &$form_state) {
       \Drupal::formBuilder()->processForm($form_id, $form, $form_state);
     });
 
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index c16c77a..c754957 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -121,7 +121,7 @@ function testRequiredFields() {
           \Drupal::formBuilder()->prepareForm($form_id, $form, $form_state);
           /** @var \Drupal\Core\Render\RendererInterface $renderer */
           $renderer = $this->container->get('renderer');
-          $renderer->executeInRenderContext(new RenderContext(), function () use ($form_id, $form, $form_state) {
+          $renderer->executeInRenderContext(new RenderContext(), function () use ($form_id, &$form, &$form_state) {
             \Drupal::formBuilder()->processForm($form_id, $form, $form_state);
           });
           $errors = $form_state->getErrors();
diff --git a/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php
index dff7f90..b810d0e 100644
--- a/core/modules/system/src/Tests/Form/ProgrammaticTest.php
+++ b/core/modules/system/src/Tests/Form/ProgrammaticTest.php
@@ -76,7 +76,7 @@ private function submitForm($values, $valid_input) {
     $form_state = (new FormState())->setValues($values);
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_state) {
+    $renderer->executeInRenderContext(new RenderContext(), function () use (&$form_state) {
       \Drupal::formBuilder()->submitForm('\Drupal\form_test\Form\FormTestProgrammaticForm', $form_state);
     });
 
diff --git a/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php b/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php
index b08f7b8..f190bc0 100644
--- a/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php
+++ b/core/modules/system/src/Tests/Form/TriggeringElementProgrammedUnitTest.php
@@ -93,7 +93,7 @@ function testLimitValidationErrors() {
     $form_builder = $this->container->get('form_builder');
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, $form_state) {
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($form_builder, &$form_state) {
       $form_builder->submitForm($this, $form_state);
     });