diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 74641593e13e08f329dae2a18fec9102da34a905..83dc831b781a5e75673dc53d567a45541bff31a3 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -1970,11 +1970,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/fluid/Classes/ViewHelpers/Transform/HtmlViewHelper.php
 
-		-
-			message: "#^Call to an undefined method Psr\\\\Container\\\\ContainerInterface\\:\\:set\\(\\)\\.$#"
-			count: 4
-			path: ../../typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$input of method TYPO3\\\\CMS\\\\Core\\\\Resource\\\\ResourceFactory\\:\\:retrieveFileOrFolderObject\\(\\) expects string, int given\\.$#"
 			count: 1
@@ -2880,11 +2875,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/install/Classes/Updates/DatabaseRowsUpdateWizard.php
 
-		-
-			message: "#^Call to an undefined method Psr\\\\Container\\\\ContainerInterface\\:\\:set\\(\\)\\.$#"
-			count: 1
-			path: ../../typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
-
 		-
 			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with array\\{string, string, string\\} and array\\<TYPO3\\\\CMS\\\\Core\\\\Messaging\\\\FlashMessage\\> will always evaluate to false\\.$#"
 			count: 1
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php
index ac32022e14a55fd99440804c21b5803a4aa47ca3..9e3d0e5252b64f91cc63db89abf58fbea0c69a6e 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php
@@ -50,7 +50,7 @@ final class BackendControllerTest extends FunctionalTestCase
     public function backendPageRenderEventIsTriggered(): void
     {
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
 
         $state = [
             'after-backend-page-render-listener' => null,
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php
index 78357e4f589a44e8166062634af22431b1836c66..6505baab61652bb034f31058ce1291871ef0e1db 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php
@@ -719,7 +719,7 @@ final class TreeControllerTest extends FunctionalTestCase
         $afterPageTreeItemsPreparedEvent = null;
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'after-page-tree-items-prepared-listener',
             static function (AfterPageTreeItemsPreparedEvent $event) use (&$afterPageTreeItemsPreparedEvent) {
diff --git a/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php b/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php
index 51f35e6cbd212de1d63cff759bf101ea1f364954..155f89045dac4b3ce040c43788926baa171f2ee8 100644
--- a/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php
@@ -101,8 +101,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
         ];
 
         /** @var Container $container */
-        $container = $this->getContainer();
-
+        $container = $this->get('service_container');
         $container->set(
             'noop',
             static function (BeforeFlexFormDataStructureIdentifierInitializedEvent $event) {
@@ -127,8 +126,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
         $subject = new FlexFormTools();
 
         /** @var Container $container */
-        $container = $this->getContainer();
-
+        $container = $this->get('service_container');
         $container->set(
             'identifier-one',
             static function (BeforeFlexFormDataStructureIdentifierInitializedEvent $event) {
@@ -156,8 +154,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
         $subject = new FlexFormTools();
 
         /** @var Container $container */
-        $container = $this->getContainer();
-
+        $container = $this->get('service_container');
         $container->set(
             'modifier-one',
             static function (AfterFlexFormDataStructureIdentifierInitializedEvent $event) {
@@ -1134,8 +1131,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
     public function parseDataStructureByIdentifierParsesDataStructureReturnedByEvent(): void
     {
         /** @var Container $container */
-        $container = $this->getContainer();
-
+        $container = $this->get('service_container');
         $container->set(
             'string',
             static function (BeforeFlexFormDataStructureParsedEvent $event) {
@@ -1463,8 +1459,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
         $identifier = '{"type":"tca","tableName":"aTableName","fieldName":"aFieldName","dataStructureKey":"default"}';
 
         /** @var Container $container */
-        $container = $this->getContainer();
-
+        $container = $this->get('service_container');
         $container->set(
             'mock',
             static function (AfterFlexFormDataStructureParsedEvent $event) {
diff --git a/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php b/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php
index 1bee83e36c98ade7855bfde088ee8889383e860e..8677f6fbc0df8de9c2293d16e40f4091e0d94e60 100644
--- a/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php
+++ b/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php
@@ -42,7 +42,7 @@ final class MailerTest extends FunctionalTestCase
         $afterMailerSentMessageEvent = null;
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'after-mailer-initialized-listener',
             static function (AfterMailerInitializationEvent $event) use (&$afterMailerInitializedEvent) {
diff --git a/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php b/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php
index 37069864bb2c19772ae620712b999655b685010c..733ea18b44a65a1edb41340f3b150391e445b72c 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php
@@ -157,7 +157,7 @@ final class DefaultUploadFolderResolverTest extends FunctionalTestCase
         $subject = GeneralUtility::makeInstance(DefaultUploadFolderResolver::class);
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'after-default-upload-folder-was-resolved-listener',
             static function (AfterDefaultUploadFolderWasResolvedEvent $event) use (&$afterDefaultUploadFolderWasResolvedEvent) {
@@ -183,7 +183,7 @@ final class DefaultUploadFolderResolverTest extends FunctionalTestCase
         $subject = GeneralUtility::makeInstance(DefaultUploadFolderResolver::class);
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'after-default-upload-folder-was-resolved-listener',
             static function (AfterDefaultUploadFolderWasResolvedEvent $event) {
diff --git a/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php b/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php
index e029e0231241b6ada9c4b2a4bda8575f42989d01..07dacd7dbc26bc747b6d05983f1ba741612f8b27 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php
@@ -45,7 +45,7 @@ final class PreviewProcessingTest extends FunctionalTestCase
         $onlineMediaId = '2004';
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             $afterVideoPreviewFetchedEventListener,
             static function (AfterVideoPreviewFetchedEvent $event) use (
diff --git a/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php b/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php
index 788d8d921b511d8f20d5e39dfdc90ed10d2f102f..45e30a5ce1681c2bec298abe34447dbf2a3f08d4 100644
--- a/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php
+++ b/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php
@@ -38,7 +38,7 @@ final class WidgetRegistryTest extends FunctionalTestCase
     protected function registerWidgets(): void
     {
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
 
         $this->subject = new WidgetRegistry($container);
 
diff --git a/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php
index f619549e33fab16397217f75b63b25cfa20bd8a9..f1f30bba8ba916c8f7d4bf136341916dc5d140de 100644
--- a/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php
@@ -61,7 +61,7 @@ final class FrontendConfigurationManagerTest extends FunctionalTestCase
         $GLOBALS['TYPO3_REQUEST'] = (new ServerRequest())->withAttribute('frontend.typoscript', $frontendTypoScript);
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set('foo-flexform-listener', static function (BeforeFlexFormConfigurationOverrideEvent $event) {
             $event->setFlexFormConfiguration([
                 'settings' => [
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
index 7c4ea30bf5b2ab81798bda84a830613b6166bb78..59506a2d278f755a7f21c495247b94db3847a19a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
@@ -73,9 +73,9 @@ final class CollectionValidatorTest extends FunctionalTestCase
             [$this->get(ReflectionService::class)]
         );
         /** @var ContainerBuilder $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(ValidatorResolver::class, $mockValidatorResolver);
-        $subject = $this->get(CollectionValidator::class);
+        $subject = $container->get(CollectionValidator::class);
         $subject->setOptions(['elementValidator' => 'EmailAddress']);
         $emailAddressValidator = new EmailAddressValidator();
         $emailAddressValidator->setOptions([]);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
index ffae7b1528eea4fd1588bb0b602f7aa759a29a23..52b2b015ed8c60547c525b7444c5502ffce15f36 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
@@ -427,7 +427,7 @@ EOT;
                 return $object->getId();
             }
         );
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(PersistenceManager::class, $mockPersistenceManager);
 
         $context = $container->get(RenderingContextFactory::class)->create();
@@ -459,7 +459,7 @@ EOT;
         // Mock persistence manager for our domain objects and set into container
         $mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
         $mockPersistenceManager->method('getIdentifierByObject')->willReturn('fakeUid');
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(PersistenceManager::class, $mockPersistenceManager);
 
         $context = $container->get(RenderingContextFactory::class)->create();
@@ -488,7 +488,7 @@ EOT;
         // Mock persistence manager for our domain objects and set into container
         $mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
         $mockPersistenceManager->method('getIdentifierByObject')->willReturn('fakeUid');
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(PersistenceManager::class, $mockPersistenceManager);
 
         $context = $container->get(RenderingContextFactory::class)->create();
@@ -517,7 +517,7 @@ EOT;
         // Mock persistence manager for our domain objects and set into container
         $mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
         $mockPersistenceManager->method('getIdentifierByObject')->willReturn(null);
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(PersistenceManager::class, $mockPersistenceManager);
 
         $context = $container->get(RenderingContextFactory::class)->create();
diff --git a/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php b/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
index e01ce15d580987272677d0997031a031c2dafa80..7acc1776eca153a0e9335b25c910799995dccd34 100644
--- a/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
+++ b/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
@@ -61,7 +61,7 @@ final class PhpErrorCodeViewHelperTest extends FunctionalTestCase
         // of ext:install VH's in container. To circumvent this conflict, we for now
         // instantiate our VH SuT and container->set() it to force service resolving.
         $viewHelperInstance = new PhpErrorCodeViewHelper();
-        $this->getContainer()->set(PhpErrorCodeViewHelper::class, $viewHelperInstance);
+        $this->get('service_container')->set(PhpErrorCodeViewHelper::class, $viewHelperInstance);
 
         $context = $this->get(RenderingContextFactory::class)->create();
         $context->getViewHelperResolver()->addNamespace('install', 'TYPO3\\CMS\\Install\\ViewHelpers');
diff --git a/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php b/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php
index e3188dcd961364cbfa03e912c96a52197709c221..92dca91aba8a64869d7f075bf105901267f9ff1e 100644
--- a/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php
+++ b/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php
@@ -40,7 +40,7 @@ final class GlobalVariableProviderTest extends FunctionalTestCase
         $modifiedBlindedConfigurationOptions = [$globalVariableKey => $blindedConfiguration];
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'modify-blinded-configuration-options',
             static function (ModifyBlindedConfigurationOptionsEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php b/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php
index 531f61e19f992c60eb986fdb0c2339941e4c87b5..3ba1c4e77124e36a2efc10d7aa96c70e11060233 100644
--- a/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php
@@ -61,7 +61,7 @@ final class ManagementControllerTest extends FunctionalTestCase
         $setHosts = ['*', 'example.com'];
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'modify-redirect-management-controller-view-data-event',
             static function (ModifyRedirectManagementControllerViewDataEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php
index 8c1084c4c2f21a84dbcd15e0b857baf696db53d9..9ed4c2dc868309cf7c48a616272cb0bb12e5f5c5 100644
--- a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php
@@ -154,7 +154,7 @@ final class AddPageTypeZeroSourceTest extends FunctionalTestCase
         $siteLanguage = $site->getDefaultLanguage();
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'add-custom-page-type-source',
             static function (SlugRedirectChangeItemCreatedEvent $event) {
diff --git a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php
index 40ec915420124f76eb05ba6d8ec0b3b292b7253a..c2cbc58194ce74d31b26391763c05fac4418d915 100644
--- a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php
@@ -45,7 +45,7 @@ final class AddPlainSlugReplacementSourceTest extends FunctionalTestCase
 
         // Removing AddPageTypeZeroSource event is needed to avoid cross dependency here for this test.
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             AddPageTypeZeroSource::class,
             static function (SlugRedirectChangeItemCreatedEvent $event) {}
diff --git a/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php b/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php
index 2be8cbad815dcec0b7fee395c5653a68c6946934..93a951bc733763a1899fb7034a3d404c06207ede 100644
--- a/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php
@@ -118,7 +118,7 @@ final class SlugRedirectChangeItemFactoryTest extends FunctionalTestCase
         ]);
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'slug-redirect-change-item-created',
             static function (SlugRedirectChangeItemCreatedEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php b/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
index a2640975718daf0b38b5a23320ad4983c6ab0089..b61343b5f589f34026ac5c74426bf3abe3d5eb96 100644
--- a/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
@@ -892,7 +892,7 @@ final class RedirectServiceTest extends FunctionalTestCase
 
         $dispatchedEvents = [];
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'before-redirect-match-domain-event-is-triggered',
             static function (BeforeRedirectMatchDomainEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php b/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php
index 63d7092dcdb13eb0b3f658f59335861eadf69c51..54393e0fa64f9c353809661e38b57038cc44e79b 100644
--- a/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php
@@ -420,7 +420,7 @@ final class SlugServiceTest extends FunctionalTestCase
         $this->importCSVDataSet(__DIR__ . '/Fixtures/SlugServiceTest_ModifyAutoCreateRedirectRecordBeforePersistingEvent.csv');
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'modify-auto-create-redirect-record-before-persisting',
             static function (ModifyAutoCreateRedirectRecordBeforePersistingEvent $event) use (
@@ -472,7 +472,7 @@ final class SlugServiceTest extends FunctionalTestCase
         $this->importCSVDataSet(__DIR__ . '/Fixtures/SlugServiceTest_AfterAutoCreateRedirectHasBeenPersistedEvent.csv');
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'after-auto-create-redirect-has-been-persisted',
             static function (AfterAutoCreateRedirectHasBeenPersistedEvent $event) use (
diff --git a/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php b/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php
index d15ff9742644a14da9378149fc89db92586e9f45..ac6979d7ec81009682d1fd0e218d005e06b2dd67 100644
--- a/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php
+++ b/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php
@@ -50,7 +50,7 @@ final class BrowseLinksControllerTest extends FunctionalTestCase
     public function linkEventsAreTriggered(): void
     {
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
 
         $state = [
             'modify-link-handl-listener' => null,
diff --git a/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php b/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php
index 640d82b89c162b4b954ed9a6a7180a3165752dab..786280a95f529981aba54f1cce9263be111844c4 100644
--- a/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php
+++ b/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php
@@ -160,7 +160,7 @@ final class CanonicalGeneratorTest extends FunctionalTestCase
         $modifyUrlForCanonicalTagEvent = null;
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'modify-url-for-canonical-tag-listener',
             static function (ModifyUrlForCanonicalTagEvent $event) use (&$modifyUrlForCanonicalTagEvent) {
diff --git a/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php b/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php
index c9fbe9e565cc7ed2aedbd080c2df374f524e198c..42aa5a45a17ffb51e1c9fcfc5d0d6aaa4526869d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php
@@ -96,7 +96,7 @@ final class DataHandlerHookTest extends FunctionalTestCase
         $afterRecordPublishedEvent = null;
 
         /** @var Container $container */
-        $container = $this->getContainer();
+        $container = $this->get('service_container');
         $container->set(
             'after-record-published-event',
             static function (AfterRecordPublishedEvent $event) use (&$afterRecordPublishedEvent) {